Browse Source

fix install of python bindings

Waldemar Brodkorb 11 years ago
parent
commit
8baf607914
2 changed files with 14 additions and 2 deletions
  1. 4 1
      package/libxml2/Makefile
  2. 10 1
      package/libxml2/patches/patch-configure

+ 4 - 1
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

+ 10 - 1
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