SF.net SVN: gar:[22975] csw/mgar/pkg/ntop/trunk

[chninkel at users.sourceforge.net]

Revision: 22975
          http://sourceforge.net/p/gar/code/22975
Author:   chninkel
Date:     2014-02-08 14:17:01 +0000 (Sat, 08 Feb 2014)
Log Message:
-----------
ntop/trunk: fix python detection

Modified Paths:
--------------
    csw/mgar/pkg/ntop/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch

Modified: csw/mgar/pkg/ntop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 12:40:24 UTC (rev 22974)
+++ csw/mgar/pkg/ntop/trunk/Makefile	2014-02-08 14:17:01 UTC (rev 22975)
@@ -33,6 +33,7 @@
 PATCHFILES += 0006-Change-default-PID-file-location-to-var-opt-csw-ntop.patch
 PATCHFILES += 0007-Update-the-URL-for-etter.finger.os.patch
 PATCHFILES += 0008-Update-defaults-from-usr-local-to-opt-csw-etc-opt-cs.patch
+PATCHFILES += 0009-Fix-python-config-detection-and-python-cflags-assign.patch
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=17233
@@ -89,6 +90,7 @@
 # CONFIGURE_ARGS += --enable-fc
 # CONFIGURE_ARGS += --enable-mysql
 
+EXTRA_CONFIGURE_ENV += PYTHON=/opt/csw/bin/python2.6-config
 
 # We don't have a separate devel-package, so this is ok
 CHECKPKG_OVERRIDES_CSWntop += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libcpacketPlugin.so

Added: csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch
===================================================================
--- csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch	                        (rev 0)
+++ csw/mgar/pkg/ntop/trunk/files/0009-Fix-python-config-detection-and-python-cflags-assign.patch	2014-02-08 14:17:01 UTC (rev 22975)
@@ -0,0 +1,44 @@
+From 47a24ec95f6a0e488cffa7982c225029d915019e Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Sat, 8 Feb 2014 15:08:41 +0100
+Subject: [PATCH] Fix python-config detection and python cflags assignation in
+ configure
+
+---
+ configure.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 2fcfa86..fe8e49a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1454,7 +1454,7 @@ dnl>
+   AC_CHECK_TOOL(PYTHON, python-config)
+   PYTHON_CONFIG=""
+ 
+-  if test "x$ac_cv_prog_ac_ct_PYTHON" != "xpython-config"; then   
++  if test "x$ac_cv_prog_ac_ct_PYTHON" = "x"; then   
+        if test -f "/etc/debian_version"; then
+        	   AC_MSG_RESULT(Please install python-dev and rerun configure)
+ 	   exit 1
+@@ -1469,7 +1469,7 @@ dnl>
+         fi
+      fi
+   else
+-     PYTHON_CONFIG="python-config"
++     PYTHON_CONFIG="$ac_cv_prog_ac_ct_PYTHON"
+   fi
+ 
+   if test "x$PYTHON_CONFIG" != "x"; then
+@@ -1482,7 +1482,7 @@ dnl>
+ 
+     dnl remove unecessary path
+     dnl line below workaround for OSX 10.6 (Snow Leopard)/10.7 (Lion)
+-    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386// | sed -e "s/-arch ppc// | sed -e "s/-arch x86_64//"`
++    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
+     INCS="${INCS} ${PYTHON_INCS}"
+ 
+ OLD_CFLAGS=$CFLAGS
+-- 
+1.8.4.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.