diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-27 21:30:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-11-27 21:30:43 +0100 |
| commit | ae3d4616ed9c19a29d656193254657f93d612fa2 (patch) | |
| tree | 139e4b901bfef70776833359d8dc747a8a9fd292 /package/libxml2/patches | |
| parent | 0f77fa26b817ae7a022fd3f1682b1c5a31905682 (diff) | |
try to fixup mesalib compile, it needs libxml2 python module
Diffstat (limited to 'package/libxml2/patches')
| -rw-r--r-- | package/libxml2/patches/patch-configure_in | 12 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-python_Makefile_am | 17 | ||||
| -rw-r--r-- | package/libxml2/patches/patch-python_setup_py | 11 |
3 files changed, 34 insertions, 6 deletions
diff --git a/package/libxml2/patches/patch-configure_in b/package/libxml2/patches/patch-configure_in index a8340e906..6432ced20 100644 --- a/package/libxml2/patches/patch-configure_in +++ b/package/libxml2/patches/patch-configure_in @@ -1,5 +1,5 @@ --- libxml2-2.9.1.orig/configure.in 2013-04-19 09:25:20.000000000 +0200 -+++ libxml2-2.9.1/configure.in 2013-10-31 08:37:36.000000000 +0100 ++++ libxml2-2.9.1/configure.in 2013-11-23 23:02:06.000000000 +0100 @@ -748,80 +748,16 @@ PYTHON_SITE_PACKAGES= PYTHON_TESTS= pythondir= @@ -77,11 +77,11 @@ - fi - fi - fi -+ PYTHON_INCLUDES=`$PYTHON$PYTHON_VERSION-config --includes` -+ PYTHON_LIBS=`$PYTHON$PYTHON_VERSION-config --ldflags` -+ PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages - pythondir='$(PYTHON_SITE_PACKAGES)' -- PYTHON_LIBS=`python$PYTHON_VERSION-config --ldflags` +- 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 diff --git a/package/libxml2/patches/patch-python_Makefile_am b/package/libxml2/patches/patch-python_Makefile_am new file mode 100644 index 000000000..82061eee3 --- /dev/null +++ b/package/libxml2/patches/patch-python_Makefile_am @@ -0,0 +1,17 @@ +--- libxml2-2.9.1.orig/python/Makefile.am 2013-04-19 08:56:45.000000000 +0200 ++++ libxml2-2.9.1/python/Makefile.am 2013-11-24 09:18:44.000000000 +0100 +@@ -19,12 +19,12 @@ if WITH_PYTHON + AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ +- -I$(PYTHON_INCLUDES) ++ $(PYTHON_INCLUDES) + + python_LTLIBRARIES = libxml2mod.la + + libxml2mod_la_SOURCES = libxml.c libxml_wrap.h libxml2-py.h libxml2-py.c types.c +-libxml2mod_la_LDFLAGS = $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ ++libxml2mod_la_LDFLAGS = $(LDFLAGS) $(CYGWIN_EXTRA_LDFLAGS) $(WIN32_EXTRA_LDFLAGS) -module -avoid-version \ + $(top_builddir)/libxml2.la $(CYGWIN_EXTRA_PYTHON_LIBADD) $(WIN32_EXTRA_PYTHON_LIBADD) $(PYTHON_LIBS) + + BUILT_SOURCES = libxml2-export.c libxml2-py.h libxml2-py.c diff --git a/package/libxml2/patches/patch-python_setup_py b/package/libxml2/patches/patch-python_setup_py new file mode 100644 index 000000000..13ec3493d --- /dev/null +++ b/package/libxml2/patches/patch-python_setup_py @@ -0,0 +1,11 @@ +--- libxml2-2.9.1.orig/python/setup.py 2013-04-19 09:36:20.000000000 +0200 ++++ libxml2-2.9.1/python/setup.py 2013-11-21 18:47:16.000000000 +0100 +@@ -8,7 +8,7 @@ from distutils.core import setup, Extens + # Below ROOT, we expect to find include, include/libxml2, lib and bin. + # On *nix, it is not needed (but should not harm), + # on Windows, it is set by configure.js. +-ROOT = r'/usr' ++ROOT = r'/Volumes/adk/openadk/host_i686_gnu_eglibc/usr' + + # Thread-enabled libxml2 + with_threads = 1 |