Use dpkg-buildflags to get compilation flags

* Use dpkg-buildflags to get the default values of CFLAGS, CPPFLAGS, and
  LDFLAGS.  Upstream does not entirely honor these yet, but we're
  getting closer.

diff --git a/debian/changelog b/debian/changelog
index 148b08e4c6d446e6c57b55391f74f5e59ef836b9..b23b09f88a457877e5525984787c0a5d1175647f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openafs (1.6.0~pre5-2) UNRELEASED; urgency=low
 
   * Apply upstream patch from http://gerrit.openafs.org/#change,4656 for
     correct reading of files larger than the chunk size.
+  * Use dpkg-buildflags to get the default values of CFLAGS, CPPFLAGS, and
+    LDFLAGS.  Upstream does not entirely honor these yet, but we're
+    getting closer.
 
  -- Russ Allbery <rra@debian.org>  Sat, 14 May 2011 23:47:41 -0700
 

diff --git a/debian/rules b/debian/rules
index 7eb75845fe1916e6d2b3d3a72cde312a780ef57a..cd4a71bce2bc90f7b8cbf973c311dbbf623d7120 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,11 @@ else
     SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+# Set compiler flags.
+CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
 # Determine whether we're building with optimization.  This doesn't really
 # work at the moment due to upstream problems.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -91,6 +96,7 @@ override_dh_auto_configure:
        sh regen.sh
        afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \
            sh configure \
+           CFLAGS=$(CFLAGS) CPPFLAGS=$(CPPFLAGS) LDFLAGS=$(LDFLAGS) \
            --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \
            --prefix=/usr --mandir=\$${prefix}/share/man \
            --sysconfdir=/etc --libexecdir=/usr/lib --with-krb5 \