[SCM] stk/master: Do not override user-supplied CXXFLAGS

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fb21181566825c326b6da190e3a754496adeb164
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sat Jul 23 11:28:36 2016 -0400

    Do not override user-supplied CXXFLAGS

diff --git a/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch b/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch
new file mode 100644
index 0000000..3baab8b
--- /dev/null
+++ b/debian/patches/Do-not-override-user-supplied-CXXFLAGS.patch
@@ -0,0 +1,24 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Sat, 23 Jul 2016 11:26:07 -0400
+Subject: Do not override user-supplied CXXFLAGS
+
+Prepend local flags to that
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e33dc93..ab2b567 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,8 +99,8 @@ fi
+ # For -I and -D flags
+ CPPFLAGS="$CPPFLAGS $cppflag"
+ 
+-# For debugging and optimization ... overwrite default because it has both -g and -O2
+-CXXFLAGS="$cxxflag"
++# For debugging and optimization ...
++CXXFLAGS="$cxxflag $CXXFLAGS"
+ 
+ # Check compiler and use -Wall if gnu.
+ if [test $GXX = "yes" ;] then
diff --git a/debian/patches/series b/debian/patches/series
index bb872b9..88e670b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Fix-install-target-for-new-soname-scheme.patch
 Finish-renaming-SKINI.patch
 demo-needs-rt.patch
 Sort-o-files
+Do-not-override-user-supplied-CXXFLAGS.patch

-- 
stk packaging