[Pkg-zsh-commits] [zsh] 01/01: Move export of DEB_BUILD_MAINT_OPTIONS before buildflags.mk inclusion

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 118bf219d10f8e5d39642acc04328f718dfba737
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Aug 31 00:59:22 2014 +0200

    Move export of DEB_BUILD_MAINT_OPTIONS before buildflags.mk inclusion
    
    Git-Dch: Ignore
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index be0c1a1..e4ab160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,12 @@
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
 
+# Disable -fstack-protector-strong on s390x as it causes endless loops
+# in gcc-4.9. See https://bugs.debian.org/759870 for details
+ifeq (s390x,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
+export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
+endif
+
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 H_LDFLAGS = $(LDFLAGS)
@@ -40,12 +46,6 @@ CONFIGFLAGS += --enable-zsh-secure-free
 CONFIGFLAGS += --enable-zsh-hash-debug
 endif
 
-# Disable -fstack-protector-strong on s390x as it causes endless loops
-# in gcc-4.9. See https://bugs.debian.org/759870 for details
-ifeq (s390x,$(shell dpkg-architecture -qDEB_BUILD_ARCH))
-export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
-endif
-
 BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W libcap-dev libncursesw5-dev libpcre3-dev libc-dev-bin)
 
 build: build-arch build-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git