[DHG_packages] 04/16: Whitespace fixes in debian/patches
Joachim Breitner
nomeata at moszumanska.debian.org
Sun Jul 26 21:14:26 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch jessie-backports
in repository DHG_packages.
commit 882f2114fab99983838d1df78bf7e369dee093ad
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sun Jul 26 09:39:25 2015 +0200
Whitespace fixes in debian/patches
result of the darcs→git conversion?
---
p/ghc/debian/patches/hurd.diff | 14 +++----
p/ghc/debian/patches/mips-support.patch | 14 +++----
p/ghc/debian/patches/saner-linker-opt-handling | 44 +++++++++++-----------
p/ghc/debian/patches/use-debian-gen_contents_index | 14 +++----
p/ghc/debian/patches/use-gold-on-arm | 8 ++--
5 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/p/ghc/debian/patches/hurd.diff b/p/ghc/debian/patches/hurd.diff
index 033825f..a7856ac 100644
--- a/p/ghc/debian/patches/hurd.diff
+++ b/p/ghc/debian/patches/hurd.diff
@@ -1,9 +1,9 @@
Provided by “Pino” via Samuel Thibault. Not yet pushed upstream.
-Index: ghc-7.8.4/aclocal.m4
+Index: ghc/aclocal.m4
===================================================================
---- ghc-7.8.4.orig/aclocal.m4 2015-05-01 08:18:15.978547005 +0200
-+++ ghc-7.8.4/aclocal.m4 2015-05-01 08:18:15.974546986 +0200
+--- ghc.orig/aclocal.m4 2015-07-26 09:39:03.417394234 +0200
++++ ghc/aclocal.m4 2015-07-26 09:39:03.413394058 +0200
@@ -271,12 +271,15 @@
nto-qnx)
test -z "[$]2" || eval "[$]2=OSQNXNTO"
@@ -21,17 +21,17 @@ Index: ghc-7.8.4/aclocal.m4
*)
echo "Unknown OS '[$]1'"
exit 1
-Index: ghc-7.8.4/compiler/utils/Platform.hs
+Index: ghc/compiler/utils/Platform.hs
===================================================================
---- ghc-7.8.4.orig/compiler/utils/Platform.hs 2015-05-01 08:18:15.978547005 +0200
-+++ ghc-7.8.4/compiler/utils/Platform.hs 2015-05-01 08:18:15.974546986 +0200
+--- ghc.orig/compiler/utils/Platform.hs 2015-07-26 09:39:03.417394234 +0200
++++ ghc/compiler/utils/Platform.hs 2015-07-26 09:39:03.413394058 +0200
@@ -81,6 +81,7 @@
| OSOsf3
| OSQNXNTO
| OSAndroid
+ | OSHurd
deriving (Read, Show, Eq)
-
+
-- | ARM Instruction Set Architecture, Extensions and ABI
@@ -125,6 +126,7 @@
-- per comment below it's safe
diff --git a/p/ghc/debian/patches/mips-support.patch b/p/ghc/debian/patches/mips-support.patch
index 0fa6373..e36817b 100644
--- a/p/ghc/debian/patches/mips-support.patch
+++ b/p/ghc/debian/patches/mips-support.patch
@@ -10,18 +10,18 @@ is attached.
After applying this patch,
I was able to successfully build ghc 7.8.2 for mips nad mipsel.
-Index: ghc-7.8.3/mk/config.mk.in
+Index: ghc/mk/config.mk.in
===================================================================
---- ghc-7.8.3.orig/mk/config.mk.in 2014-07-18 22:46:32.190912601 +0200
-+++ ghc-7.8.3/mk/config.mk.in 2014-07-18 22:46:44.622912143 +0200
+--- ghc.orig/mk/config.mk.in 2015-07-26 09:39:01.657316374 +0200
++++ ghc/mk/config.mk.in 2015-07-26 09:39:01.653316196 +0200
@@ -99,7 +99,9 @@
- x86_64-unknown-mingw32 \
- i386-unknown-mingw32 \
- sparc-sun-solaris2 \
+ x86_64-unknown-mingw32 \
+ i386-unknown-mingw32 \
+ sparc-sun-solaris2 \
- sparc-unknown-linux
+ sparc-unknown-linux \
+ mips-unknown-linux \
+ mipsel-unknown-linux
-
+
ifeq "$(SOLARIS_BROKEN_SHLD)" "YES"
NoSharedLibsPlatformList += i386-unknown-solaris2
diff --git a/p/ghc/debian/patches/saner-linker-opt-handling b/p/ghc/debian/patches/saner-linker-opt-handling
index ed4621b..c9722cd 100644
--- a/p/ghc/debian/patches/saner-linker-opt-handling
+++ b/p/ghc/debian/patches/saner-linker-opt-handling
@@ -13,23 +13,23 @@ where -fuse-ld=gold caused problems.
So as a work-around we remove any other use of CONF_GCC_LINKER_OPTS_STAGE2.
-Index: ghc-7.8.4/libffi/ghc.mk
+Index: ghc/libffi/ghc.mk
===================================================================
---- ghc-7.8.4.orig/libffi/ghc.mk 2014-12-23 15:28:03.043620563 +0100
-+++ ghc-7.8.4/libffi/ghc.mk 2014-12-23 15:28:03.039620491 +0100
+--- ghc.orig/libffi/ghc.mk 2015-07-26 09:39:02.397349205 +0200
++++ ghc/libffi/ghc.mk 2015-07-26 09:39:02.393349028 +0200
@@ -95,7 +95,7 @@
- NM=$(NM) \
- RANLIB=$(REAL_RANLIB_CMD) \
+ NM=$(NM) \
+ RANLIB=$(REAL_RANLIB_CMD) \
CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE1) -w" \
- LDFLAGS="$(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE1) -w" \
+ LDFLAGS="$(SRC_LD_OPTS) -w" \
"$(SHELL)" ./configure \
- --prefix=$(TOP)/libffi/build/inst \
- --libdir=$(TOP)/libffi/build/inst/lib \
-Index: ghc-7.8.4/mk/config.mk.in
+ --prefix=$(TOP)/libffi/build/inst \
+ --libdir=$(TOP)/libffi/build/inst/lib \
+Index: ghc/mk/config.mk.in
===================================================================
---- ghc-7.8.4.orig/mk/config.mk.in 2014-12-23 15:28:03.043620563 +0100
-+++ ghc-7.8.4/mk/config.mk.in 2014-12-23 15:28:03.039620491 +0100
+--- ghc.orig/mk/config.mk.in 2015-07-26 09:39:02.397349205 +0200
++++ ghc/mk/config.mk.in 2015-07-26 09:39:02.393349028 +0200
@@ -570,7 +570,6 @@
# $1 = stage
SRC_HSC2HS_OPTS_STAGE$1 += $$(addprefix --cflag=,$$(filter-out -O,$$(SRC_CC_OPTS) $$(CONF_CC_OPTS_STAGE$1)))
@@ -38,10 +38,10 @@ Index: ghc-7.8.4/mk/config.mk.in
endef
$(eval $(call set_stage_HSC2HS_OPTS,0))
$(eval $(call set_stage_HSC2HS_OPTS,1))
-Index: ghc-7.8.4/rules/build-package-data.mk
+Index: ghc/rules/build-package-data.mk
===================================================================
---- ghc-7.8.4.orig/rules/build-package-data.mk 2014-12-23 15:28:03.043620563 +0100
-+++ ghc-7.8.4/rules/build-package-data.mk 2014-12-23 15:28:03.039620491 +0100
+--- ghc.orig/rules/build-package-data.mk 2015-07-26 09:39:02.397349205 +0200
++++ ghc/rules/build-package-data.mk 2015-07-26 09:39:02.393349028 +0200
@@ -50,7 +50,7 @@
# for a feature it may not generate warning-free C code, and thus may
# think that the feature doesn't exist if -Werror is on.
@@ -49,24 +49,24 @@ Index: ghc-7.8.4/rules/build-package-data.mk
-$1_$2_CONFIGURE_LDFLAGS = $$(SRC_LD_OPTS) $$(CONF_GCC_LINKER_OPTS_STAGE$3) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)
+$1_$2_CONFIGURE_LDFLAGS = $$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS)
$1_$2_CONFIGURE_CPPFLAGS = $$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_OPTS)
-
+
$1_$2_CONFIGURE_OPTS += --configure-option=CFLAGS="$$($1_$2_CONFIGURE_CFLAGS)"
-Index: ghc-7.8.4/rules/distdir-opts.mk
+Index: ghc/rules/distdir-opts.mk
===================================================================
---- ghc-7.8.4.orig/rules/distdir-opts.mk 2014-12-23 15:28:03.043620563 +0100
-+++ ghc-7.8.4/rules/distdir-opts.mk 2014-12-23 15:28:03.039620491 +0100
+--- ghc.orig/rules/distdir-opts.mk 2015-07-26 09:39:02.397349205 +0200
++++ ghc/rules/distdir-opts.mk 2015-07-26 09:39:02.393349028 +0200
@@ -64,7 +64,6 @@
endif
-
+
$1_$2_DIST_LD_OPTS = \
- $$(CONF_GCC_LINKER_OPTS_STAGE$3) \
$$(SRC_LD_OPTS) \
$$($1_LD_OPTS) \
$$($1_$2_LD_OPTS) \
-Index: ghc-7.8.4/utils/hsc2hs/ghc.mk
+Index: ghc/utils/hsc2hs/ghc.mk
===================================================================
---- ghc-7.8.4.orig/utils/hsc2hs/ghc.mk 2014-12-23 15:28:03.043620563 +0100
-+++ ghc-7.8.4/utils/hsc2hs/ghc.mk 2014-12-23 15:28:03.039620491 +0100
+--- ghc.orig/utils/hsc2hs/ghc.mk 2015-07-26 09:39:02.397349205 +0200
++++ ghc/utils/hsc2hs/ghc.mk 2015-07-26 09:39:02.393349028 +0200
@@ -27,7 +27,7 @@
# system uses it for all stages and passes the right options for each stage
# on the command line
@@ -74,5 +74,5 @@ Index: ghc-7.8.4/utils/hsc2hs/ghc.mk
-echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE1)) $(addprefix --lflag=,$(CONF_GCC_LINKER_OPTS_STAGE1))"' >> "$(WRAPPER)"
+echo 'HSC2HS_EXTRA="$(addprefix --cflag=,$(CONF_CC_OPTS_STAGE1))"' >> "$(WRAPPER)"
endef
-
+
ifneq "$(BINDIST)" "YES"
diff --git a/p/ghc/debian/patches/use-debian-gen_contents_index b/p/ghc/debian/patches/use-debian-gen_contents_index
index bc05d2b..cf7972e 100644
--- a/p/ghc/debian/patches/use-debian-gen_contents_index
+++ b/p/ghc/debian/patches/use-debian-gen_contents_index
@@ -1,7 +1,7 @@
-Index: ghc-7.9.20140130/ghc.mk
+Index: ghc/ghc.mk
===================================================================
---- ghc-7.9.20140130.orig/ghc.mk 2014-01-31 12:18:02.170196705 +0000
-+++ ghc-7.9.20140130/ghc.mk 2014-01-31 12:18:17.654196059 +0000
+--- ghc.orig/ghc.mk 2015-07-26 09:38:29.383764050 +0200
++++ ghc/ghc.mk 2015-07-26 09:38:29.379763842 +0200
@@ -755,7 +755,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
@@ -11,19 +11,19 @@ Index: ghc-7.9.20140130/ghc.mk
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
@@ -864,12 +863,8 @@
- $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
- $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
+ $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html")
+ $(call INSTALL_DOC,$(INSTALL_OPTS),docs/index.html,"$(DESTDIR)$(docdir)/html")
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
- $(call INSTALL_DIR,"$(DESTDIR)$(docdir)/html/libraries")
- for i in $(INSTALL_LIBRARY_DOCS); do \
- $(call INSTALL_DOC,$(INSTALL_OPTS),$$i,"$(DESTDIR)$(docdir)/html/libraries/"); \
- done
+ mkdir -p $(DESTDIR)$(docdir)/html/libraries/
- $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/")
+ $(call INSTALL_DATA,$(INSTALL_OPTS),libraries/prologue.txt,"$(DESTDIR)$(docdir)/html/libraries/")
- $(call INSTALL_SCRIPT,$(INSTALL_OPTS),libraries/gen_contents_index,"$(DESTDIR)$(docdir)/html/libraries/")
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
- for i in $(INSTALL_HTML_DOC_DIRS); do \
+ for i in $(INSTALL_HTML_DOC_DIRS); do \
@@ -981,7 +976,6 @@
mk/project.mk \
mk/install.mk.in \
diff --git a/p/ghc/debian/patches/use-gold-on-arm b/p/ghc/debian/patches/use-gold-on-arm
index 03420b9..c70eb3f 100644
--- a/p/ghc/debian/patches/use-gold-on-arm
+++ b/p/ghc/debian/patches/use-gold-on-arm
@@ -1,7 +1,7 @@
-Index: ghc-7.8.3.20141119/aclocal.m4
+Index: ghc/aclocal.m4
===================================================================
---- ghc-7.8.3.20141119.orig/aclocal.m4 2014-12-08 18:49:28.207171714 +0100
-+++ ghc-7.8.3.20141119/aclocal.m4 2014-12-08 19:03:06.815522917 +0100
+--- ghc.orig/aclocal.m4 2015-07-26 09:39:02.929372765 +0200
++++ ghc/aclocal.m4 2015-07-26 09:39:02.925372588 +0200
@@ -553,6 +553,10 @@
$3="$$3 -D_HPUX_SOURCE"
$5="$$5 -D_HPUX_SOURCE"
@@ -11,5 +11,5 @@ Index: ghc-7.8.3.20141119/aclocal.m4
+ $3="$$3 -fuse-ld=gold"
+ ;;
esac
-
+
# If gcc knows about the stack protector, turn it off.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list