SOURCES: libopensync-py-m4.patch (NEW) - use python-config to set ...
glen
glen at pld-linux.org
Fri Sep 15 16:32:47 CEST 2006
Author: glen Date: Fri Sep 15 14:32:47 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use python-config to set python vars. the existing scripts scanned whole /usr/lib to find what's already in /usr/lib
---- Files affected:
SOURCES:
libopensync-py-m4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/libopensync-py-m4.patch
diff -u /dev/null SOURCES/libopensync-py-m4.patch:1.1
--- /dev/null Fri Sep 15 16:32:47 2006
+++ SOURCES/libopensync-py-m4.patch Fri Sep 15 16:32:42 2006
@@ -0,0 +1,61 @@
+--- libopensync-0.18/acinclude.m4~ 2005-04-23 20:49:39.000000000 +0300
++++ libopensync-0.18/acinclude.m4 2006-09-15 17:31:19.643489125 +0300
+@@ -1108,45 +1108,30 @@
+
+ # Check for Python include path
+ AC_MSG_CHECKING([for Python include path])
+- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+- for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
+- python_path=`find $i -type f -name Python.h -print | sed "1q"`
+- if test -n "$python_path" ; then
+- break
+- fi
+- done
+- python_path=`echo $python_path | sed "s,/Python.h$,,"`
+- AC_MSG_RESULT([$python_path])
+- if test -z "$python_path" ; then
++ python_includes=`python-config --includes`
++ AC_MSG_RESULT([$python_includes])
++ if test -z "$python_includes" ; then
+ AC_MSG_ERROR([cannot find Python include path])
+ fi
+- AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
++ AC_SUBST([PYTHON_CPPFLAGS],[-I$python_includes])
+
+ # Check for Python library path
+- AC_MSG_CHECKING([for Python library path])
+- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
+- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
+- if test -n "$python_path" ; then
+- break
+- fi
+- done
+- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
+- AC_MSG_RESULT([$python_path])
+- if test -z "$python_path" ; then
++ python_ldflags=`python-config --ldflags`
++ AC_MSG_RESULT([$python_ldflags])
++ if test -z "$python_ldflags" ; then
+ AC_MSG_ERROR([cannot find Python library path])
+ fi
+- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
+- #
+- python_site=`echo $python_path | sed "s/config/site-packages/"`
++ AC_SUBST([PYTHON_LDFLAGS],[$python_ldflags])
++
++ # unused here
++ python_site=""
+ AC_SUBST([PYTHON_SITE_PKG],[$python_site])
+ #
+ # libraries which must be linked in when embedding
+ #
++ # same as ldflags, but unused here
+ AC_MSG_CHECKING(python extra libraries)
+- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
+- conf = distutils.sysconfig.get_config_var; \
+- print conf('LOCALMODLIBS')+' '+conf('LIBS')"
++ PYTHON_EXTRA_LIBS=$python_ldflags
+ AC_MSG_RESULT($PYTHON_EXTRA_LIBS)`
+ AC_SUBST(PYTHON_EXTRA_LIBS)
+ ])
================================================================
More information about the pld-cvs-commit
mailing list