haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjust libxml2 to use vendor-packages directory.

Browse Source 
* The recent adjustment to python from 'site-packages' to
  'vendor-packages' broke this port - this adjustment fixes
  it again.
This commit is contained in:
Oliver Tappe
2013-10-18 23:54:56 +02:00
parent 5944736237
commit 9fde52b69e
2 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/libxml2/libxml2-2.8.0.recipe
View File

@@ -4,7 +4,7 @@ LICENSE="MIT"
COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved."
SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
REVISION="6"
REVISION="7"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"

39
dev-libs/libxml2/patches/libxml2-2.8.0.patchset
View File

@@ -1,4 +1,4 @@
From 847ae3527f9a7c10bbb81a299c0779bdedaa078b Mon Sep 17 00:00:00 2001
From 5f1f102b9ca68a60598e75acd2dfcc03eedf48f0 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
@@ -57,10 +57,10 @@ index 2989325..162d348 100644
--exec-prefix)
--
1.7.10.2
1.8.3.4
From 6a3fd0a71df7e9f9207cc44dab2abd77822939fa Mon Sep 17 00:00:00 2001
From af85142e9157eec3acd0b5f6d171eeb63a5dd6c5 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
@@ -88,10 +88,10 @@ index a5f86ca..ade0cf8 100644
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
then
--
1.7.10.2
1.8.3.4
From 76ec01677cdf7b754497320bca5587c423d0bf65 Mon Sep 17 00:00:00 2001
From 077d229d4c92bbb11d5ce2dfa6ce9334b77c30db 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)
@@ -121,5 +121,32 @@ index 52c89fc..7549db9 100644
PYTESTS= \
--
1.7.10.2
1.8.3.4
From 020e1f1fb2f2234d0a7222e03c6077e9df06e8fb Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Fri, 18 Oct 2013 23:51:10 +0200
Subject: Adjust libxml2 to use vendor-packages directory.
diff --git a/configure.in b/configure.in
index ade0cf8..522a2c0 100644
--- a/configure.in
+++ b/configure.in
@@ -767,10 +767,10 @@ if test "$with_python" != "no" ; then
if test "$PYTHON_VERSION" != ""
then
if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h -a \
- -d $with_python/lib/python$PYTHON_VERSION/site-packages
+ -d $with_python/lib/python$PYTHON_VERSION/vendor-packages
then
PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION
- PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/site-packages
+ PYTHON_SITE_PACKAGES=$with_python/lib/python$PYTHON_VERSION/vendor-packages
else
if test -r $prefix/include/python$PYTHON_VERSION/Python.h
then
--
1.8.3.4