[Pkg-ganeti-devel] [ganeti] 01/02: Use configure --with-haskell-flags to pass build flags

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit e9052ff302dde17127866cca631c7da9d8573610
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Jun 24 18:03:41 2014 +0300

    Use configure --with-haskell-flags to pass build flags
---
 debian/patches/pass-ghc-linker-flags.patch | 18 ------------------
 debian/patches/series                      |  1 -
 debian/rules                               |  1 +
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/patches/pass-ghc-linker-flags.patch b/debian/patches/pass-ghc-linker-flags.patch
deleted file mode 100644
index 6536cda..0000000
--- a/debian/patches/pass-ghc-linker-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Apollon Oikonomopoulos <apoikos at gmail.com>
-Description: Pass linker flags to GHC
- Enable hardening (relro) and as-needed
-
-Forwarded: no
-Last-Update: 2013-11-01
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -926,7 +926,8 @@
- HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_DEFAULT_PROGS)) src/mon-collector.hs
- HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail
- HFLAGS = -O -Wall -Werror -isrc -fwarn-monomorphism-restriction \
--	-fwarn-tabs $(GHC_BYVERSION_FLAGS) $(am__append_5) \
-+	-fwarn-tabs -optl -Wl,-z,relro -optl -Wl,--as-needed \
-+	$(GHC_BYVERSION_FLAGS) $(am__append_5) \
- 	$(am__append_6) $(am__append_7)
- HTEST_SUFFIX = hpc
- HTEST_FLAGS = $(HFLAGS) -fhpc -itest/hs \
diff --git a/debian/patches/series b/debian/patches/series
index e82830b..7011cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
-pass-ghc-linker-flags.patch
diff --git a/debian/rules b/debian/rules
index 420b9a9..b230f26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ override_dh_auto_configure:
 	  --docdir=/usr/share/doc/ganeti \
 	  --enable-restricted-commands \
 	  --disable-symlinks \
+	  --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \
 	  --with-user-prefix=$(GNT_USERGROUP_PREFIX) \
 	  --with-group-prefix=$(GNT_USERGROUP_PREFIX) \
 	  --with-ssh-initscript="/usr/sbin/invoke-rc.d ssh"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git