[ppl] 04/06: Do not use the fixdebugpath flag from dpkg-buildflags, which breaks the build.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository ppl.

commit 7a8aa58f4a64a174db888dd73ec0e76331932b89
Author: Tobias Hansen <thansen at broeselmaschine.fc.up.pt>
Date:   Sat Nov 12 16:09:08 2016 +0000

    Do not use the fixdebugpath flag from dpkg-buildflags, which breaks the build.
---
 debian/control |  1 +
 debian/rules   | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 07b6b77..3d269e7 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               dpkg-dev (>= 1.16.1~),
                libgmp-dev,
                swi-prolog [!hurd-i386],
                chrpath,
diff --git a/debian/rules b/debian/rules
index cd4801e..22b1808 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,12 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH   ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS = $(dpkg-buildflags --get CFLAGS) -Wall -g
-CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -Wall -g -fpermissive
-LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+# This flag breaks the build.
+export DEB_BUILD_MAINT_OPTIONS=reproducible=-fixdebugpath
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS += -Wall -g
+CXXFLAGS += -Wall -g -fpermissive
 
 ifeq ($(DEB_HOST_MULTIARCH),arm-linux-gnueabihf)
   CFLAGS += -marm

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