diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-11 14:40:12 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-02-11 14:40:12 -0600 |
| commit | c4a9b57d7fe027fbe9bcc31d32fb12e590f12c8c (patch) | |
| tree | 7d51d1970e7c8a9e32b1422fc27ec9edcacd8a0d /package/libxml2 | |
| parent | a6087b4263869fc5d36482cc4f58857338055e40 (diff) | |
another libxml2 python fuckup
Diffstat (limited to 'package/libxml2')
| -rw-r--r-- | package/libxml2/Makefile | 3 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-Makefile_am | 14 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-configure_ac | 4 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-python_Makefile_am | 12 |
4 files changed, 30 insertions, 3 deletions
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index c89c7cab8..ee4913f80 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -19,7 +19,7 @@ PKG_OPTS:= dev DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= LIBXML2 LIBXML2_PYTHON -PKGSD_LIBXML2_PYTHON:= XML python bindings +PKGSD_LIBXML2_PYTHON:= xml python bindings PKGSC_LIBXML2_PYTHON:= libs/misc PKGSB_LIBXML2_PYTHON:= python2 PKGSS_LIBXML2_PYTHON:= python2 @@ -33,6 +33,7 @@ $(eval $(call PKG_template,LIBXML2_PYTHON,libxml2-python,$(PKG_VERSION)-$(PKG_RE include $(ADK_TOPDIR)/mk/python.mk +TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/python$(PYTHON_VERSION) HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --with-python \ --with-threads \ diff --git a/package/libxml2/patches/patch-Makefile_am b/package/libxml2/patches/patch-Makefile_am new file mode 100644 index 000000000..f14a120d9 --- /dev/null +++ b/package/libxml2/patches/patch-Makefile_am @@ -0,0 +1,14 @@ +--- libxml2-2.9.2.orig/Makefile.am 2014-10-13 05:02:53.000000000 -0500 ++++ libxml2-2.9.2/Makefile.am 2015-02-11 12:51:49.858163855 -0600 +@@ -2,9 +2,9 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) ++SUBDIRS = include . xstc $(PYTHON_SUBDIR) + +-DIST_SUBDIRS = include . doc example python xstc ++DIST_SUBDIRS = include . python xstc + + AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include + diff --git a/package/libxml2/patches/patch-configure_ac b/package/libxml2/patches/patch-configure_ac index 2e7ab8f77..6cbef4845 100644 --- a/package/libxml2/patches/patch-configure_ac +++ b/package/libxml2/patches/patch-configure_ac @@ -1,5 +1,5 @@ --- libxml2-2.9.2.orig/configure.ac 2014-10-15 23:06:15.000000000 -0500 -+++ libxml2-2.9.2/configure.ac 2015-02-10 14:34:59.318899232 -0600 ++++ libxml2-2.9.2/configure.ac 2015-02-11 12:53:35.494162888 -0600 @@ -837,62 +837,13 @@ if test "$with_python" != "no" ; then echo Found python in environment PYTHON=$PYTHON with_python=`$PYTHON -c "import sys; print(sys.exec_prefix)"` @@ -38,7 +38,7 @@ - else - echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h - fi -+ AC_PATH_PROG(PYTHON, python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) ++ AC_PATH_PROG(PYTHON, python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) fi fi fi diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am new file mode 100644 index 000000000..b3ac2539b --- /dev/null +++ b/package/libxml2/patches/patch-python_Makefile_am @@ -0,0 +1,12 @@ +--- libxml2-2.9.2.orig/python/Makefile.am 2014-10-03 04:00:53.000000000 -0500 ++++ libxml2-2.9.2/python/Makefile.am 2015-02-11 12:53:07.150163147 -0600 +@@ -18,8 +18,7 @@ EXTRA_DIST = \ + if WITH_PYTHON + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ +- -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ -I$(top_srcdir)/include + + python_LTLIBRARIES = libxml2mod.la + |