[gnumach] 01/02: rules: Pass -no-pie to compiler to fix build on i386

[Samuel Thibault]

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

sthibault pushed a commit to branch master
in repository gnumach.

commit 35c7cf05a4869951388cc579a194019489138f4e
Author: Samuel Thibault <address@hidden>
Date:   Mon Oct 24 19:52:21 2016 +0200

    rules: Pass -no-pie to compiler to fix build on i386
    
    and fix passing flags to dbg variants.
---
 debian/changelog | 8 ++++++++
 debian/rules     | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index cefd2ee..6ee08d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnumach (2:1.7+git20161023-2) UNRELEASED; urgency=medium
+
+  * rules:
+    - Pass -no-pie to compiler to fix build on i386.
+    - Fix passing flags to dbg variants.
+
+ -- Samuel Thibault <address@hidden>  Mon, 24 Oct 2016 19:51:48 +0200
+
 gnumach (2:1.7+git20161023-1) unstable; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/rules b/debian/rules
index 0f3e528..2af77e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,8 @@ D_XEN_DBG := $(D)-xen-dbg
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-CFLAGS = -Wall -g -pipe -fno-strict-aliasing
+CFLAGS = -Wall -g -pipe -fno-strict-aliasing -no-pie
+LDFLAGS = -no-pie
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
@@ -86,6 +87,7 @@ build/config.status: configure
        -mkdir build
        cd build && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-486 ../configure 
$(drivers) \
                CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
                $(common_configure)
 
 build-xen/config.status: configure
@@ -94,6 +96,7 @@ build-xen/config.status: configure
        -mkdir build-xen
        cd build-xen && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-xen-486 ../configure \
                CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
                $(common_configure) \
                --enable-platform=xen
 
@@ -102,6 +105,8 @@ build-dbg/config.status: configure
        
        -mkdir build-dbg
        cd build-dbg && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-486-dbg ../configure 
--enable-kdb $(drivers) \
+               CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
                $(common_configure) \
 
 build-xen-dbg/config.status: configure
@@ -109,6 +114,8 @@ build-xen-dbg/config.status: configure
        
        -mkdir build-xen-dbg
        cd build-xen-dbg && PACKAGE_VERSION_SUFFIX=$(CUSTOM)-xen-486-dbg 
../configure --enable-kdb \
+               CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" \
                $(common_configure) \
                --enable-platform=xen
 

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