summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-09-25 14:01:53 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-09-25 14:01:53 +0200
commit8baf607914939e615d6e382875d263d563f8a502 (patch)
treef95f5ab66ccbb2554a3fb0d6ebca25a4e12b485c /package
parenta42b7f9cbf9b6c3f4a2b7fe2ff718e02ae15071f (diff)
fix install of python bindings
Diffstat (limited to 'package')
-rw-r--r--package/libxml2/Makefile5
-rw-r--r--package/libxml2/patches/patch-configure11
2 files changed, 14 insertions, 2 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 2ecd71dd5..602d2d551 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= libxml2
PKG_VERSION:= 2.9.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 9c0cfef285d5c4a5c80d00904ddab380
PKG_DESCR:= XML C parser and toolkit
PKG_SECTION:= libs
@@ -63,6 +63,9 @@ CONFIGURE_ARGS+= --without-c14n \
--with-xptr \
--with-zlib
+pre-configure:
+ ${INSTALL_DIR} ${STAGING_DIR}/usr/lib/site-packages
+
libxml2-install:
${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib
diff --git a/package/libxml2/patches/patch-configure b/package/libxml2/patches/patch-configure
index 13406bc62..2f9b3b5bf 100644
--- a/package/libxml2/patches/patch-configure
+++ b/package/libxml2/patches/patch-configure
@@ -1,5 +1,5 @@
--- libxml2-2.9.1.orig/configure 2013-04-19 09:36:11.000000000 +0200
-+++ libxml2-2.9.1/configure 2013-09-04 15:16:48.000000000 +0200
++++ libxml2-2.9.1/configure 2013-09-25 13:59:27.000000000 +0200
@@ -14010,17 +14010,17 @@ case ${host} in
esac
@@ -22,6 +22,15 @@
else
if test -x "$with_python/python.exe"
then
+@@ -14122,7 +14122,7 @@ fi
+ else
+ if test -d $with_python/lib/site-packages
+ then
+- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
++ PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
+ else
+ PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
+ fi
@@ -14148,7 +14148,7 @@ else
PYTHON_SUBDIR=
fi