Author: rfm
Date: Wed Jan 7 16:46:42 2015
New Revision: 38281
URL: http://svn.gna.org/viewcvs/gnustep?rev=38281&view=rev
Log:
Minor changes to allow build with clang if net-snmp uses fstack-protect-strong
Modified:
libs/ec/trunk/ChangeLog
libs/ec/trunk/GNUmakefile.preamble
libs/ec/trunk/configure
libs/ec/trunk/configure.ac
Modified: libs/ec/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/ChangeLog?rev=38281&r1=38280&r2=38281&view=diff
==============================================================================
--- libs/ec/trunk/ChangeLog (original)
+++ libs/ec/trunk/ChangeLog Wed Jan 7 16:46:42 2015
@@ -1,3 +1,10 @@
+2015-01-07 Richard Frith-Macdonald <[email protected]>
+
+ * configure.ac:
+ * GNUMakefile.preamble:
+ Filter out fstack-protect-strong from snmp cflags because clang
+ doesn't support it.
+
2014-11-28 Richard Frith-Macdonald <[email protected]>
* EcAlarmSinkSNMP.m: Fix incorrect OID setup for alarm table in
Modified: libs/ec/trunk/GNUmakefile.preamble
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/GNUmakefile.preamble?rev=38281&r1=38280&r2=38281&view=diff
==============================================================================
--- libs/ec/trunk/GNUmakefile.preamble (original)
+++ libs/ec/trunk/GNUmakefile.preamble Wed Jan 7 16:46:42 2015
@@ -48,7 +48,7 @@
# Extras for when building with SNMP support
#
ifeq ($(WITH_NET_SNMP),yes)
- EcAlarmSinkSNMP.m_FILE_FLAGS += $(shell net-snmp-config --cflags | sed -e
's/-l[^ ]*//g')
+ EcAlarmSinkSNMP.m_FILE_FLAGS += $(shell net-snmp-config --cflags | sed -e
's/-l[^ ]*//g' | sed -d 's/-fstack-protect-strong//g')
LIBRARIES_DEPEND_UPON += $(shell net-snmp-config --agent-libs)
endif
Modified: libs/ec/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/configure?rev=38281&r1=38280&r2=38281&view=diff
==============================================================================
--- libs/ec/trunk/configure (original)
+++ libs/ec/trunk/configure Wed Jan 7 16:46:42 2015
@@ -4444,7 +4444,7 @@
if test "x$NETSNMPCONFIG" != "xno" ; then
ac_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
+ CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags | sed -e
's/-fstack-protector-strong//'`"
for ac_header in net-snmp/net-snmp-config.h
do
@@ -4591,8 +4591,9 @@
done
+ CPPFLAGS="$ac_save_CPPFLAGS"
if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes"; then
- CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
+ CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags | sed -e
's/-fstack-protector-strong//'`"
SNMP_LIBS=`$NETSNMPCONFIG --libs`
cat >>confdefs.h <<\_ACEOF
@@ -4601,8 +4602,6 @@
WITH_NET_SNMP="yes"
fi
- else
- CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test $WITH_NET_SNMP = "no"; then
{ { $as_echo "$as_me:$LINENO: error: Unable to find/use net-snmp ... you
must install the net-snmp development package for your system or disable the
use of net-snmp" >&5
Modified: libs/ec/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/ec/trunk/configure.ac?rev=38281&r1=38280&r2=38281&view=diff
==============================================================================
--- libs/ec/trunk/configure.ac (original)
+++ libs/ec/trunk/configure.ac Wed Jan 7 16:46:42 2015
@@ -51,16 +51,15 @@
AC_PATH_PROG(NETSNMPCONFIG, net-snmp-config, no, )
if test "x$NETSNMPCONFIG" != "xno" ; then
ac_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
+ CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags | sed -e
's/-fstack-protector-strong//'`"
AC_CHECK_HEADERS(net-snmp/net-snmp-config.h)
+ CPPFLAGS="$ac_save_CPPFLAGS"
if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes"; then
- CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
+ CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags | sed -e
's/-fstack-protector-strong//'`"
SNMP_LIBS=`$NETSNMPCONFIG --libs`
AC_DEFINE(WITH_NET_SNMP, 1, [Define to enable support for NET-SNMP])
WITH_NET_SNMP="yes"
fi
- else
- CPPFLAGS="$ac_save_CPPFLAGS"
fi
if test $WITH_NET_SNMP = "no"; then
AC_MSG_ERROR([Unable to find/use net-snmp ... you must install the
net-snmp development package for your system or disable the use of net-snmp])
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
