[cpp-log4shib] 17/20: Specify the empty pkg-config Cflags setting via a variable

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/1.0.9-1
in repository cpp-log4shib.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=66da772390156288c8493e1a2eb5e703028acfab

commit 66da772390156288c8493e1a2eb5e703028acfab
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 14 21:14:51 2016 +0100

    Specify the empty pkg-config Cflags setting via a variable
    
    Otherwise the default leaks our build flags.
---
 debian/rules | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/rules b/debian/rules
index dda2bcb..7591188 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # drop a few unnecessary dependencies.
 export DEB_LDFLAGS_MAINT_APPEND = -lpthread -Wl,--as-needed
 
-# Set the results of dpkg-buildflags as make variables.  We don't use this
-# to communicate to dh_auto_configure; it calls dpkg-buildflags itself.
-# It's only used to strip those flags out of the pkgconfig file.  If we
-# can't import this, we don't care.
--include /usr/share/dpkg/buildflags.mk
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
 else
@@ -24,27 +18,18 @@ else
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static $(DEBUG)
+	dh_auto_configure -- --disable-static $(DEBUG) log4shib_cflags=' '
+# avoid leaking build flags into the pkg-config file
 
-# Remove the upstream-installed documentation, and strip the build flags out
-# of the Cflags and Libs pkgconfig configuration.  LDFLAGS and CPPFLAGS are
-# set by /usr/share/dpkg/buildflags.mk above.
 override_dh_install:
 	pod2man --release=$(VERSION) --section=1 --center=log4shib \
 	    debian/log4shib-config.pod debian/log4shib-config.1
 	find debian/tmp/usr/share/doc/log4shib-*/api/html -name "*.md5" -delete
 	rm debian/tmp/usr/lib/x86_64-linux-gnu/liblog4shib.la
 	dh_install -Xman3 --fail-missing
-	perl -i -pe 's/^(Libs: .*)\Q$(LDFLAGS)\E/$$1/' \
-	    debian/*/usr/lib/*/pkgconfig/log4shib.pc
-	perl -i -pe 's/^(Cflags: .*)\Q$(CPPFLAGS)\E/$$1/' \
-	    debian/*/usr/lib/*/pkgconfig/log4shib.pc
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 %:
 	dh $@ --with autoreconf
-
-# Don't attempt to build the buildflags.mk file if it doesn't exist.
-/usr/share/dpkg/buildflags.mk:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.