[cpp-log4shib] 02/05: Add build system patches for better FLAGS handling

[Scott Cantor]

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

scantor pushed a commit to annotated tag debian/2.0.0-2
in repository cpp-log4shib.

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

commit 67ed4d0b16b110673a5a82f5b1adb3e207e5e251
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Sat Nov 24 16:03:16 2018 +0100

    Add build system patches for better FLAGS handling
---
 ...le-building-the-static-library-by-default.patch | 21 +++++++++++++
 debian/patches/Simplify-C-XX-FLAGS-handling.patch  | 36 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 59 insertions(+)

diff --git a/debian/patches/Disable-building-the-static-library-by-default.patch b/debian/patches/Disable-building-the-static-library-by-default.patch
new file mode 100644
index 0000000..dd57f9f
--- /dev/null
+++ b/debian/patches/Disable-building-the-static-library-by-default.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at debian.org>
+Date: Sat, 24 Nov 2018 15:55:43 +0100
+Subject: Disable building the static library by default
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7ef2fb0..c2912a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,7 +42,7 @@ else
+     AM_CXXFLAGS="-O2 -DNDEBUG"
+ fi
+ 
+-AM_PROG_LIBTOOL
++LT_INIT([disable-static])
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
diff --git a/debian/patches/Simplify-C-XX-FLAGS-handling.patch b/debian/patches/Simplify-C-XX-FLAGS-handling.patch
new file mode 100644
index 0000000..e363d11
--- /dev/null
+++ b/debian/patches/Simplify-C-XX-FLAGS-handling.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at debian.org>
+Date: Sat, 24 Nov 2018 15:57:59 +0100
+Subject: Simplify C(XX)FLAGS handling
+
+Leave the default at -g -O2 as AC_PROG_CC sets it; such options are
+better customized by setting C(XX)FLAGS on the command line.
+Defining NDEBUG is risky, don't do that; use --enable-debug for
+producing the debug variant only (which is identical to the normal
+variant at the moment).
+---
+ configure.ac | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2912a0..49dae10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,15 +31,12 @@ AC_ARG_WITH(idsa, AS_HELP_STRING(--with-idsa, [include idsa support]),)
+ AC_CANONICAL_HOST
+ 
+ AC_ARG_ENABLE(debug,
+-    AS_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]),
++    AS_HELP_STRING(--enable-debug, [Produce debug variant (Default = no)]),
+     enable_debug=$enableval, enable_debug=no)
+ 
+ if test "$enable_debug" = "yes" ; then
+-    AM_CFLAGS="-g -D_DEBUG"
+-    AM_CXXFLAGS="-g -D_DEBUG"
+-else
+-    AM_CFLAGS="-O2 -DNDEBUG"
+-    AM_CXXFLAGS="-O2 -DNDEBUG"
++    AM_CFLAGS="-D_DEBUG"
++    AM_CXXFLAGS="-D_DEBUG"
+ fi
+ 
+ LT_INIT([disable-static])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a9d5a21
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+Disable-building-the-static-library-by-default.patch
+Simplify-C-XX-FLAGS-handling.patch

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