mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
libxml2: build python module as well
This commit is contained in:
125
dev-libs/libxml2/patches/libxml2-2.8.0.patchset
Normal file
125
dev-libs/libxml2/patches/libxml2-2.8.0.patchset
Normal file
@@ -0,0 +1,125 @@
|
||||
From 847ae3527f9a7c10bbb81a299c0779bdedaa078b Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Fri, 9 Aug 2013 03:04:24 +0200
|
||||
Subject: applying patch libxml2-2.8.0.patch
|
||||
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index f82cefa..c4464a6 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1208,8 +1208,8 @@ pkgconfig_DATA = libxml-2.0.pc
|
||||
#
|
||||
# Install the tests program sources as examples
|
||||
#
|
||||
-BASE_DIR=$(datadir)/doc
|
||||
-DOC_MODULE=libxml2-$(VERSION)
|
||||
+BASE_DIR=$(docdir)
|
||||
+DOC_MODULE=
|
||||
EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
|
||||
|
||||
install-data-local:
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 0fb4983..a5f86ca 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1,7 +1,7 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT(entities.c)
|
||||
-AM_CONFIG_HEADER(config.h)
|
||||
+AC_CONFIG_HEADERS(config.h)
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
diff --git a/xml2-config.in b/xml2-config.in
|
||||
index 2989325..162d348 100644
|
||||
--- a/xml2-config.in
|
||||
+++ b/xml2-config.in
|
||||
@@ -40,8 +40,8 @@ while test $# -gt 0; do
|
||||
case "$1" in
|
||||
--prefix=*)
|
||||
prefix=$optarg
|
||||
- includedir=$prefix/include
|
||||
- libdir=$prefix/lib
|
||||
+ includedir=$prefix/develop/headers
|
||||
+ libdir=$prefix/develop/lib
|
||||
;;
|
||||
|
||||
--prefix)
|
||||
@@ -50,7 +50,7 @@ while test $# -gt 0; do
|
||||
|
||||
--exec-prefix=*)
|
||||
exec_prefix=$optarg
|
||||
- libdir=$exec_prefix/lib
|
||||
+ libdir=$exec_prefix/develop/lib
|
||||
;;
|
||||
|
||||
--exec-prefix)
|
||||
--
|
||||
1.7.10.2
|
||||
|
||||
|
||||
From 6a3fd0a71df7e9f9207cc44dab2abd77822939fa Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Fri, 9 Aug 2013 20:15:20 +0200
|
||||
Subject: configure.in: hack to find python directories on Haiku
|
||||
|
||||
configure should really just ask python-config instead of searching
|
||||
the stuff itself.
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index a5f86ca..ade0cf8 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -766,11 +766,11 @@ if test "$with_python" != "no" ; then
|
||||
fi
|
||||
if test "$PYTHON_VERSION" != ""
|
||||
then
|
||||
- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
|
||||
+ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \
|
||||
-d $with_python/lib/python$PYTHON_VERSION/site-packages
|
||||
then
|
||||
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
|
||||
- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
|
||||
+ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION
|
||||
+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
|
||||
else
|
||||
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
|
||||
then
|
||||
--
|
||||
1.7.10.2
|
||||
|
||||
|
||||
From 76ec01677cdf7b754497320bca5587c423d0bf65 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Weinhold <ingo_weinhold@gmx.de>
|
||||
Date: Fri, 9 Aug 2013 23:00:24 +0200
|
||||
Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir)
|
||||
|
||||
|
||||
diff --git a/python/Makefile.am b/python/Makefile.am
|
||||
index 68d2236..3bad10f 100644
|
||||
--- a/python/Makefile.am
|
||||
+++ b/python/Makefile.am
|
||||
@@ -9,7 +9,7 @@ INCLUDES = \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_builddir)/$(subdir)
|
||||
|
||||
-docsdir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)
|
||||
+docsdir = $(docdir)_python-$(LIBXML_VERSION)
|
||||
# libxml2class.txt is generated
|
||||
dist_docs_DATA = TODO
|
||||
|
||||
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
|
||||
index 52c89fc..7549db9 100644
|
||||
--- a/python/tests/Makefile.am
|
||||
+++ b/python/tests/Makefile.am
|
||||
@@ -1,4 +1,4 @@
|
||||
-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
|
||||
+exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples
|
||||
dist_example_DATA = $(PYTESTS) $(XMLS)
|
||||
|
||||
PYTESTS= \
|
||||
--
|
||||
1.7.10.2
|
||||
|
||||
Reference in New Issue
Block a user