diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-26 14:43:30 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-09-26 14:43:30 +0200 |
| commit | b9651f108b91776e565087dcdc2ac934b3483458 (patch) | |
| tree | da6e829c913143f6e7fc77ebf40e16294d865795 /package/libxml2 | |
| parent | d08bbc851385b23b0491ceb78546cf0794daf149 (diff) | |
| parent | d0cedd6214f7c35b73a22464c8688dbf9eb79f62 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libxml2')
| -rw-r--r-- | package/libxml2/Makefile | 5 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-configure | 11 |
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 |