[cpp-sp] 03/08: Don't change the C(XX)FLAGS provided by the user
Scott Cantor
cantor.2 at osu.edu
Fri Oct 12 14:06:39 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=d0d27f09e994cb2de862eef413a16f538286d0d7
commit d0d27f09e994cb2de862eef413a16f538286d0d7
Author: Ferenc Wágner <wferi at debian.org>
AuthorDate: Fri Aug 10 15:10:12 2018 +0200
Don't change the C(XX)FLAGS provided by the user
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.
Enable another bunch of warnings (-W) under GCC.
Fix ignored AM_C(XX)FLAGS usage in the storage plugins.
Fix redundant CXXFLAGS usage in shibsptest.
---
adfs/Makefile.am | 2 ++
apache/Makefile.am | 4 ++++
configure.ac | 27 ++++++++++-----------------
fastcgi/Makefile.am | 2 ++
memcache-store/Makefile.am | 5 ++---
nsapi_shib/Makefile.am | 1 +
odbc-store/Makefile.am | 5 ++---
plugins/Makefile.am | 2 ++
shibd/Makefile.am | 1 +
shibsp/Makefile.am | 2 ++
unittests/Makefile.am | 2 +-
util/Makefile.am | 2 ++
12 files changed, 31 insertions(+), 24 deletions(-)
diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index f9eabee..76f09ef 100644
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -4,6 +4,7 @@ plugindir = $(libdir)/@PACKAGE_NAME@
plugin_LTLIBRARIES = adfs.la adfs-lite.la
adfs_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(opensaml_CFLAGS) \
@@ -24,6 +25,7 @@ adfs_lite_la_SOURCES = \
adfs.cpp
adfs_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(xmltooling_lite_CFLAGS) \
diff --git a/apache/Makefile.am b/apache/Makefile.am
index 5e21102..5dadc65 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -6,6 +6,7 @@ modshib13_LTLIBRARIES = mod_shib_13.la
mod_shib_13_la_SOURCES = mod_shib_13.cpp
mod_shib_13_la_LDFLAGS = -module -avoid-version
mod_shib_13_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(APXS_CFLAGS) -I$(APXS_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
@@ -24,6 +25,7 @@ modshib20_LTLIBRARIES = mod_shib_20.la
mod_shib_20_la_SOURCES = mod_shib_20.cpp
mod_shib_20_la_LDFLAGS = -module -avoid-version
mod_shib_20_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(APXS2_CFLAGS) -I$(APXS2_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
@@ -44,6 +46,7 @@ modshib22_LTLIBRARIES = mod_shib_22.la
mod_shib_22_la_SOURCES = mod_shib_22.cpp
mod_shib_22_la_LDFLAGS = -module -avoid-version
mod_shib_22_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(APXS22_CFLAGS) -I$(APXS22_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
@@ -64,6 +67,7 @@ modshib24_LTLIBRARIES = mod_shib_24.la
mod_shib_24_la_SOURCES = mod_shib_24.cpp
mod_shib_24_la_LDFLAGS = -module -avoid-version
mod_shib_24_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(APXS24_CFLAGS) -I$(APXS24_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
diff --git a/configure.ac b/configure.ac
index 5638dd6..efff793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,15 +20,12 @@ DX_INIT_DOXYGEN(shibboleth, doxygen.cfg, doc/api)
DX_INCLUDE=
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
- GCC_CFLAGS="$CFLAGS -g -D_DEBUG"
- GCC_CXXFLAGS="$CXXFLAGS -g -D_DEBUG"
-else
- GCC_CFLAGS="$CFLAGS -O2 -DNDEBUG"
- GCC_CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
+ AM_CFLAGS="-D_DEBUG"
+ AM_CXXFLAGS="-D_DEBUG"
fi
AC_CONFIG_HEADERS([config.h shibsp/config_pub.h])
@@ -39,29 +36,25 @@ AC_PROG_CXX([g++ g++3 c++ CC])
AC_CANONICAL_HOST
if test "$GCC" = "yes" ; then
-# AC_HAVE_GCC_VERSION(4,0,0,0,
-# [
-# AC_DEFINE(GCC_HASCLASSVISIBILITY,1,
-# [Define to enable class visibility control in gcc.])
-# GCC_CFLAGS="$GCC_CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-# GCC_CXXFLAGS="$GCC_CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-# ])
- CFLAGS="-Wall $GCC_CFLAGS"
- CXXFLAGS="-Wall $GCC_CXXFLAGS"
+ AM_CFLAGS="$AM_CFLAGS -Wall -W"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Wall -W"
fi
# Fix for Sun Workshop compiler in debug mode, may be Sun case #6360993
case "${host_cpu}-${host_os}" in
*solaris*)
if test "$CXX" = "CC" ; then
- CXXFLAGS="$CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
+ AM_CXXFLAGS="$AM_CXXFLAGS -Qoption ccfe -stabs=no%dfltlit+no%dflthlp"
fi
;;
*osf*)
- CXXFLAGS="$CXXFLAGS -D_POSIX_PII_SOCKET"
+ AM_CXXFLAGS="$AM_CXXFLAGS -D_POSIX_PII_SOCKET"
;;
esac
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+
LT_INIT([disable-static])
AC_LANG(C)
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index 5e343c3..d5c7749 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -8,6 +8,7 @@ fastcgi_PROGRAMS = shibauthorizer shibresponder
shibauthorizer_SOURCES = shibauthorizer.cpp
shibauthorizer_CXXFLAGS = $(FASTCGI_INCLUDE) \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(xerces_CFLAGS) \
@@ -21,6 +22,7 @@ shibauthorizer_LDADD = $(FASTCGI_LIBS) \
shibresponder_SOURCES = shibresponder.cpp
shibresponder_CXXFLAGS = $(FASTCGI_INCLUDE) \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(xerces_CFLAGS) \
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index dc98d66..c296cbe 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -3,11 +3,10 @@ AUTOMAKE_OPTIONS = foreign
plugindir = $(libdir)/@PACKAGE_NAME@
plugin_LTLIBRARIES = memcache-store.la
-AM_CFLAGS = $(MEMCACHED_INCLUDE)
-AM_CXXFLAGS = $(MEMCACHED_INCLUDE)
-
memcache_store_la_LDFLAGS = $(MEMCACHED_LDFLAGS) -module -avoid-version
memcache_store_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
+ $(MEMCACHED_INCLUDE) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(opensaml_CFLAGS) \
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 0bb08bd..93fda58 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -5,6 +5,7 @@ nsapi_shibdir = $(libdir)/@PACKAGE_NAME@
nsapi_shib_LTLIBRARIES = nsapi_shib.la
nsapi_shib_la_SOURCES = nsapi_shib.cpp
nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE) \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(xerces_CFLAGS) \
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 0fe909a..95b9e92 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -3,10 +3,9 @@ AUTOMAKE_OPTIONS = foreign
plugindir = $(libdir)/@PACKAGE_NAME@
plugin_LTLIBRARIES = odbc-store.la
-AM_CFLAGS = $(ODBC_CFLAGS)
-AM_CXXFLAGS = $(ODBC_CFLAGS)
-
odbc_store_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
+ $(ODBC_CFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(opensaml_CFLAGS) \
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8bec3bd..06ad88b 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -21,6 +21,7 @@ plugins_lite_la_SOURCES = \
${common_sources}
plugins_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(opensaml_CFLAGS) \
@@ -48,6 +49,7 @@ plugins_lite_la_LIBADD = \
plugins_la_LDFLAGS = -module -avoid-version
plugins_lite_la_LDFLAGS = -module -avoid-version
plugins_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(xerces_CFLAGS) \
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index 68192f4..596de41 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -5,6 +5,7 @@ sbin_PROGRAMS = shibd
shibd_SOURCES = shibd.cpp
shibd_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(PTHREAD_CFLAGS) \
$(SYSTEMD_CFLAGS) \
$(opensaml_CFLAGS) \
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index f8514c6..608c2f5 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -244,6 +244,7 @@ libshibsp_la_SOURCES = \
# http://sources.redhat.com/autobook/autobook/autobook_91.html
libshibsp_la_LDFLAGS = -version-info 8:2:0
libshibsp_la_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(gss_CFLAGS) $(gnu_gss_CFLAGS) \
@@ -262,6 +263,7 @@ libshibsp_la_LIBADD = \
$(xmltooling_LIBS)
libshibsp_lite_la_LDFLAGS = -version-info 8:2:0
libshibsp_lite_la_CXXFLAGS = -DSHIBSP_LITE \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(PTHREAD_CFLAGS) \
$(gss_CFLAGS) $(gnu_gss_CFLAGS) \
diff --git a/unittests/Makefile.am b/unittests/Makefile.am
index dabef81..c563e17 100644
--- a/unittests/Makefile.am
+++ b/unittests/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
if BUILD_UNITTEST
bin_PROGRAMS = shibsptest
-shibsptest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
+shibsptest_CXXFLAGS = $(AM_CXXFLAGS) $(CXXTESTFLAGS)
else
bin_PROGRAMS =
endif
diff --git a/util/Makefile.am b/util/Makefile.am
index 5866c6b..aa6b6e0 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -5,6 +5,7 @@ bin_PROGRAMS = mdquery resolvertest
resolvertest_SOURCES = resolvertest.cpp
resolvertest_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(BOOST_CPPFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
$(opensaml_CFLAGS) \
@@ -25,6 +26,7 @@ EXTRA_DIST = \
resolvertest.rc
mdquery_CXXFLAGS = \
+ $(AM_CXXFLAGS) \
$(log4shib_CFLAGS) $(log4cpp_CFLAGS) \
$(opensaml_CFLAGS) \
$(xerces_CFLAGS) \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list