Attachment 159084 Details for Bug 201773 – Patch file fixing net-mgmt/colletd5 port to build with debug python

[patch] Patch file fixing net-mgmt/colletd5 port to build with debug python

collectd-configure-debug-python.patch (text/plain), 3.64 KB, created by Suraj Ravichandran on 2015-07-22 19:51:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Suraj Ravichandran

Created: 2015-07-22 19:51:48 UTC

Size: 3.64 KB

patch

obsolete

>diff --git net-mgmt/collectd/Makefile net-mgmt/collectd/Makefile
>index d45fc0d..7c92920 100644
>--- net-mgmt/collectd/Makefile
>+++ net-mgmt/collectd/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	collectd
> PORTVERSION=	4.10.9
>-PORTREVISION=	19
>+PORTREVISION=	20
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> 
>diff --git net-mgmt/collectd5/files/patch-configure.ac net-mgmt/collectd5/files/patch-configure.ac
>index 5f886af..f593d90 100644
>--- net-mgmt/collectd5/files/patch-configure.ac
>+++ net-mgmt/collectd5/files/patch-configure.ac
>@@ -1,6 +1,6 @@
>---- configure.ac.orig	2015-02-26 11:49:16 UTC
>-+++ configure.ac
>-@@ -111,7 +111,7 @@ then
>+--- configure.ac.orig	2015-07-08 15:59:11.366409238 -0700
>++++ configure.ac	2015-07-08 17:11:06.119875987 -0700
>+@@ -111,7 +111,7 @@
>  fi
>  
>  # Where to install .pc files.
>@@ -9,7 +9,7 @@
>  AC_SUBST(pkgconfigdir)
>  
>  # Check for standards compliance mode
>-@@ -1440,6 +1440,7 @@ if test "x$with_kstat" = "xyes"
>+@@ -1440,6 +1440,7 @@
>  then
>  	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
>  fi
>@@ -17,7 +17,7 @@
>  if test "x$with_kstat" = "xyes"
>  then
>  	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
>-@@ -1449,6 +1450,8 @@ if test "x$with_kstat" = "xyes"
>+@@ -1449,6 +1450,8 @@
>  then
>  	AC_DEFINE(HAVE_LIBKSTAT, 1,
>  		  [Define to 1 if you have the 'kstat' library (-lkstat)])
>@@ -26,7 +26,34 @@
>  fi
>  AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
>  AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
>-@@ -3508,7 +3511,7 @@ fi
>+@@ -3455,7 +3458,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	AC_MSG_CHECKING([for Python CPPFLAGS])
>+-	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2>&1`
>++	python_include_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_python_inc())" | "$with_python_prog" 2> /dev/null`
>+ 	python_config_status=$?
>+ 
>+ 	if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
>+@@ -3478,7 +3481,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	AC_MSG_CHECKING([for Python LDFLAGS])
>+-	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2>&1`
>++	python_library_path=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"LIBDIR\").__getitem__(0))" | "$with_python_prog" 2> /dev/null`
>+ 	python_config_status=$?
>+ 
>+ 	if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
>+@@ -3493,7 +3496,7 @@
>+ if test "x$with_python" = "xyes"
>+ then
>+ 	AC_MSG_CHECKING([for Python LIBS])
>+-	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2>&1`
>++	python_library_flags=`echo "import distutils.sysconfig;import sys;sys.stdout.write(distutils.sysconfig.get_config_vars(\"BLDLIBRARY\").__getitem__(0))" | "$with_python_prog" 2> /dev/null`
>+ 	python_config_status=$?
>+ 
>+ 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
>+@@ -3508,7 +3511,7 @@
>  if test "x$with_python" = "xyes"
>  then
>  	LDFLAGS="-L$python_library_path $LDFLAGS"
>@@ -35,7 +62,7 @@
>  
>  	AC_CHECK_FUNC(PyObject_CallFunction,
>  		      [with_python="yes"],
>-@@ -4415,7 +4418,7 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
>+@@ -4415,7 +4418,7 @@
>  	then
>  		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
>  		with_libvarnish_cflags="-I$withval/include"

Actions: View | Diff

Attachments on bug 201773: 159084 | 159751