diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-29 16:06:00 +0100 |
| commit | 8e8512391c668fc7074f812f15eabe8f176fb01e (patch) | |
| tree | f9f0862dd6eb962fe3fc4803180b431843f6c5be /package/libxml2/patches/patch-configure_in | |
| parent | c491653a1f9574a42965025805d472c3d145f699 (diff) | |
| parent | ae3d4616ed9c19a29d656193254657f93d612fa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libxml2/patches/patch-configure_in')
| -rw-r--r-- | package/libxml2/patches/patch-configure_in | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in new file mode 100644 index 000000000..6432ced20 --- /dev/null +++ b/package/libxml2/patches/patch-configure_in @@ -0,0 +1,87 @@ +--- libxml2-2.9.1.orig/configure.in 2013-04-19 09:25:20.000000000 +0200 ++++ libxml2-2.9.1/configure.in 2013-11-23 23:02:06.000000000 +0100 +@@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES= + PYTHON_TESTS= + pythondir= + if test "$with_python" != "no" ; then +- if test -x "$with_python/bin/python" +- then +- echo Found python in $with_python/bin/python +- PYTHON="$with_python/bin/python" +- else +- if test -x "$with_python/python.exe" +- then +- echo Found python in $with_python/python.exe +- PYTHON="$with_python/python.exe" +- else +- if test -x "$with_python" +- then +- echo Found python in $with_python +- PYTHON="$with_python" +- else +- if test -x "$PYTHON" +- then +- echo Found python in environment PYTHON=$PYTHON +- with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"` +- else +- AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +- fi +- fi +- fi +- fi ++ AC_PATH_PROG(PYTHON, python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) + if test "$PYTHON" != "" + then + PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` +- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` +-# does not work as it produce a /usr/lib/python path instead of/usr/lib64/python +-# +-# PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` + echo Found Python version $PYTHON_VERSION + fi +- if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = "" +- then +- if test -r $with_python/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION +- else +- if test -r $prefix/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION +- else +- if test -r /usr/include/python$PYTHON_VERSION/Python.h +- then +- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION +- else +- if test -r $with_python/include/Python.h +- then +- PYTHON_INCLUDES=$with_python/include +- else +- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h +- fi +- fi +- fi +- fi +- fi +- if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = "" +- then +- if test -d $libdir/python$PYTHON_VERSION/site-packages +- then +- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages +- else +- if test -d $with_python/lib/site-packages +- then +- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages +- else +- PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"` +- fi +- fi +- fi +- pythondir='$(PYTHON_SITE_PACKAGES)' ++ PYTHON_INCLUDES=`python$PYTHON_VERSION-config --includes` + PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` ++ PYTHON_SITE_PACKAGES=${prefix}/lib/python$PYTHON_VERSION/site-packages ++ pythondir='$(PYTHON_SITE_PACKAGES)' + else + PYTHON= + fi |