[csw-devel] SF.net SVN: gar:[20881] csw/mgar/pkg/ntop/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sat Apr 27 16:22:56 CEST 2013
Revision: 20881
http://gar.svn.sourceforge.net/gar/?rev=20881&view=rev
Author: bdwalton
Date: 2013-04-27 14:22:55 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
ntop/trunk: fix the breakages of auto* tools on solaris
Modified Paths:
--------------
csw/mgar/pkg/ntop/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch
csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch
Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile 2013-04-27 13:24:20 UTC (rev 20880)
+++ csw/mgar/pkg/ntop/trunk/Makefile 2013-04-27 14:22:55 UTC (rev 20881)
@@ -32,6 +32,12 @@
PATCHFILES += 0006-Temporary-Fix-for-Broken-sourceforge-CVS-access.patch
PATCHFILES += 0007-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
+# Added by bwalton to make auto* happy again; These should likely be
+# upstreamed.
+PATCHFILES += 0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
+PATCHFILES += 0002-Modernize-a-few-macros-in-configure.in.patch
+PATCHFILES += 0003-Add-an-extra-automake-option-for-per-target-compiler.patch
+
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233
UPSTREAM_USE_SF = 1
Added: csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0001-Update-macros-used-in-Makefile.am-for-modern-convent.patch 2013-04-27 14:22:55 UTC (rev 20881)
@@ -0,0 +1,42 @@
+From 7208317da489838e604ca975bf9eb2fad1a2c49f Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Apr 2013 16:13:13 +0200
+Subject: [PATCH 1/3] Update macros used in Makefile.am for modern convention
+
+INCLUDES is a deprecated name in Makefile.am. Use AM_CPPFLAGS instead.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ Makefile.am | 2 +-
+ plugins/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5a6f022..646b8bd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -33,7 +33,7 @@ PROGRAM = $(PKGNAME)-$(VERSION)
+ DEFS = @DEFS@
+ INCS = @INCS@
+
+-INCLUDES = -I. $(INCS) ${RRD_INC}
++AM_CPPFLAGS = -I. $(INCS) ${RRD_INC}
+ LIBS =
+ BASE_LIBS = @LIBS@ @CORELIBS@ ${RRD_LIB}
+ AS = @AS@
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 88e193c..3c412e7 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -37,7 +37,7 @@ SUFFIXES = .so
+ #
+ plugindir = $(libdir)/ntop/plugins
+
+-INCLUDES = -I.. @INCS@ ${RRD_INC}
++AM_CPPFLAGS = -I.. @INCS@ ${RRD_INC}
+
+ #
+ # The meat for ntop
+--
+1.8.1.4
+
Added: csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0002-Modernize-a-few-macros-in-configure.in.patch 2013-04-27 14:22:55 UTC (rev 20881)
@@ -0,0 +1,54 @@
+From 444f0b6a7d993ff28cf93dab9f60b4bbf53fd109 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Apr 2013 16:15:31 +0200
+Subject: [PATCH 2/3] Modernize a few macros in configure.in
+
+Use the recommended macro names for modern autoconf/automake.
+
+Also, don't call AC_PROG_CC early, call it when the script will
+indicate that it's checking for cc, etc.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure.in | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 5c6fa98..5d23209 100644
+--- a/configure.in
++++ b/configure.in
+@@ -56,7 +56,7 @@ dnl>
+ dnl> generate the config header
+ dnl>
+ umask 002
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ HAS_ERROR=
+ HAS_WARNING=
+@@ -187,13 +187,11 @@ AC_ARG_ENABLE(void,
+ # Checks for programs.
+
+ AC_PROG_CPP
+-AC_PROG_CC
+ dnl> AC_PROG_CXX no c++ code (yet?)
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
+-
+ AM_ENABLE_SHARED
+ AM_PROG_LIBTOOL
+
+@@ -369,7 +367,7 @@ dnl>
+ echo
+ echo "Checking C compiler program and features..."
+ echo
+-AM_PROG_CC_STDC
++AC_PROG_CC
+ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+ echo
+ echo "*******************************************************************"
+--
+1.8.1.4
+
Added: csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0003-Add-an-extra-automake-option-for-per-target-compiler.patch 2013-04-27 14:22:55 UTC (rev 20881)
@@ -0,0 +1,31 @@
+From 4bd66226376c98171e01c9cd00c3a35b32c6e0ac Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Sat, 27 Apr 2013 16:16:34 +0200
+Subject: [PATCH 3/3] Add an extra automake option for per-target compiler
+ options
+
+This squashes an automake warning and allows the compiler to be
+reliably called with both -c and -o.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ configure.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 5d23209..5f1420c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -385,6 +385,9 @@ if test ".${ac_cv_prog_cc_stdc}" = ".no"; then
+ HAS_WARNING="yes"
+ fi
+
++dnl> For per-target flags; must be called after AC_PROG_CC
++AM_PROG_CC_C_O
++
+ dnl> NTOPCONFIGDEBUG_SETTINGS([After cc stdc test])
+
+ dnl> Any common settings required to support a specific OS, distribution or release
+--
+1.8.1.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list