File Fix-Python-Include-and-Lib-search.patch of Package ganglia

Overview Repositories Revisions Requests Users Attributes Meta

File Fix-Python-Include-and-Lib-search.patch of Package ganglia

From: Egbert Eich <eich@suse.com>
Date: Thu Feb 22 20:07:40 2018 +0100
Subject: - Fix Python Include and Lib search.
Patch-mainline: never
Git-commit: ce25debc3530b772d45f6210168cd6b9f1b6c3be
References:

Signed-off-by: Egbert Eich <eich@suse.com>
---
 configure.ac                     | 11 +++++++----
 gmond/Makefile.am                |  2 +-
 gmond/modules/python/Makefile.am |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index fe7983b..55d8182 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,6 +303,8 @@ fi
 
 AC_SUBST(STATIC_USER_MODULES)
 
+PKG_PROG_PKG_CONFIG
+
 if test x"$enable_python" = xyes; then
   echo
   echo Checking for python
@@ -319,13 +321,14 @@ if test x"$enable_python" = xyes; then
   if test -n "$PYTHON_BIN"; then
     # find out python version
     AC_MSG_CHECKING(Python version)
-    PyVERSION=`$PYTHON_BIN -c ['import sys; print sys.version[:3]'`]
-    PyMAJVERSION=`$PYTHON_BIN -c ['import sys; print sys.version[:1]'`]
+    PyVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version[:3])'`]
+    PyMAJVERSION=`$PYTHON_BIN -c ['import sys; print(sys.version[:1])'`]
     AC_MSG_RESULT($PyVERSION)
     PYTHON_VERSION=$PyVERSION
     AC_SUBST(PYTHON_VERSION)
 
     PyEXEC_INSTALLDIR=`$PYTHON_BIN -c "import sys; print sys.exec_prefix"`
+    PYTHON_INCLUDES=`$PKG_CONFIG --cflags python-$PyVERSION` ||
     if test -f "$PyEXEC_INSTALLDIR/include/python/Python.h"; then
       PYTHON_INCLUDES="-I$PyEXEC_INSTALLDIR/include/python"
     else
@@ -336,7 +339,9 @@ if test x"$enable_python" = xyes; then
         enable_python="no"
       fi
     fi
+    PYTHON_LIB=`$PKG_CONFIG --libs python-$PyVERSION` || PYTHON_LIB=-lpython$PyVERSION
     AC_SUBST(PYTHON_INCLUDES)
+    AC_SUBST(PYTHON_LIB)
   else
     enable_python="no"
   fi
@@ -393,8 +398,6 @@ x86_64*linux*)
   ;;
 esac
 
-PKG_PROG_PKG_CONFIG
-
 echo
 echo Checking for apr
 if test x"$libaprpath" != x && test x"$libaprpath" != xyes; then
diff --git a/gmond/Makefile.am b/gmond/Makefile.am
index 256fee3..d6fe6e9 100644
--- a/gmond/Makefile.am
+++ b/gmond/Makefile.am
@@ -33,7 +33,7 @@ GLDADD += @STATIC_USER_MODULES@
 GLDFLAGS = -static @EXPORT_SYMBOLS@
 if BUILD_PYTHON
 GLDADD += modules/python/mod_python.lo
-GLDFLAGS += -lpython@PYTHON_VERSION@
+GLDFLAGS += @PYTHON_LIB@
 endif
 else
 GCFLAGS = -D_LARGEFILE64_SOURCE
diff --git a/gmond/modules/python/Makefile.am b/gmond/modules/python/Makefile.am
index f535b07..846d498 100644
--- a/gmond/modules/python/Makefile.am
+++ b/gmond/modules/python/Makefile.am
@@ -10,7 +10,7 @@ libmodpython_la_LDFLAGS = -export-all-symbols
 else
 pkglib_LTLIBRARIES    = modpython.la
 modpython_la_SOURCES = mod_python.c 
-modpython_la_LDFLAGS = -module -avoid-version -lpython@PYTHON_VERSION@
+modpython_la_LDFLAGS = -module -avoid-version @PYTHON_LIB@
 
 EXTRA_DIST = README.in ../conf.d/modpython.conf.in
 endif

Places

File Fix-Python-Include-and-Lib-search.patch of Package ganglia

Places