[metview] 02/03: * Use -fPIC on i386 * Link "--as-needed"

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository metview.

commit e5fce329375409af94e6e30a8574beffda745015
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Nov 7 21:58:52 2015 +0000

    * Use -fPIC on i386
    * Link "--as-needed"
---
 debian/changelog | 4 +++-
 debian/rules     | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ab2033..3122df7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 metview (4.5.7-3) unstable; urgency=medium
 
   * Next in the round of exciting metview reproducibility fixes.
+  * Use -fPIC on i386
+  * Link "--as-needed"
 
- -- Alastair McKinstry <mckinstry at debian.org>  Sun, 01 Nov 2015 10:30:45 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 07 Nov 2015 21:57:40 +0000
 
 metview (4.5.7-2) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 92ee9e3..c2e554d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
+DEB_LDFLAGS_MAINT_PREPEND:= -Wl,-z,defs -Wl,--as-needed
 DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-format
 DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
-export DEB_BUILD_MAINT_OPTIONS
-export DEB_CFLAGS_MAINT_APPEND
+export DEB_BUILD_MAINT_OPTIONS DEB_CFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_PREPEND
 export QT_SELECT=5
 
 # Needed for sbuild. metview creates temp directories during build
@@ -28,6 +28,9 @@ FPIC:= ''
 ifeq ($(DEB_HOST_MULTIARCH), s390x)
 	FPIC:= -fpic
 endif
+ifeq ($(DEB_HOST_MULTIARCH), i386)
+	FPIC:= -fpic
+endif
 
 # magic debhelper rule
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git