[log4shib] 06/13: Fix the build flag leak by an upstreamable patch

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch debian/master
in repository log4shib.

commit 0628729b0ba05a54ff4dc0b767eebdd8d3e23d76
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Mon Apr 11 17:55:14 2016 +0200

    Fix the build flag leak by an upstreamable patch
---
 ...ak-the-build-flags-into-the-pkg-config-file.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 debian/rules                                         |  3 +--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch b/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch
new file mode 100644
index 0000000..26e4dbc
--- /dev/null
+++ b/debian/patches/Don-t-leak-the-build-flags-into-the-pkg-config-file.patch
@@ -0,0 +1,20 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sun, 3 Apr 2016 21:48:15 +0200
+Subject: Don't leak the build flags into the pkg-config file
+
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1b873c0..c0f84fc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,7 +140,6 @@ BB_ENABLE_DOXYGEN
+ #BB_CHECK_OMNITHREADS
+ #BB_CHECK_PTHREADS
+ 
+-LOG4SHIB_CFLAGS="$CXXFLAGS"
+ LOG4SHIB_LIBS="-llog4shib"
+ LOG4SHIB_LIBDEPS="$LIBS"
+ LOG4SHIB_VERSION="$VERSION"
diff --git a/debian/patches/series b/debian/patches/series
index 58657aa..14d810c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Detach-upstream-debian-directory-from-the-build-syst.patch
+Don-t-leak-the-build-flags-into-the-pkg-config-file.patch
diff --git a/debian/rules b/debian/rules
index 76ba546..105cff7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,7 @@ else
 endif
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-static $(DEBUG) log4shib_cflags=' '
-# avoid leaking build flags into the pkg-config file
+	dh_auto_configure -- --disable-static $(DEBUG)
 
 override_dh_auto_build-indep:
 	$(MAKE) docs

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