From a4dddbd1bda9ee5f9d59a8f117e836a79f81bed1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 23:07:23 +0000 Subject: [PATCH] python: fix config header path * enabled libxml2 2.9.1 on x86_64 --- dev-lang/python/patches/python-2.7.6.patchset | 25 ++++++++++++++++++- dev-lang/python/python-2.7.6.recipe | 4 +-- dev-libs/libxml2/libxml2-2.9.1.recipe | 7 ++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index 80c66fa0d..22d516fe1 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -1,4 +1,4 @@ -From 3a159ca3a63ebdddbd2802c08589049e26fbdf40 Mon Sep 17 00:00:00 2001 +From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -758,3 +758,26 @@ index 40ad843..24621ef 100644 -- 1.8.3.4 + +From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sat, 5 Apr 2014 21:16:40 +0000 +Subject: fix pyconfig.h path + + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index cf75650..bb54b6f 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -105,7 +105,7 @@ BINDIR= @bindir@ + LIBDIR= @libdir@ + MANDIR= @mandir@ + INCLUDEDIR= @includedir@ +-CONFINCLUDEDIR= $(exec_prefix)/include ++CONFINCLUDEDIR= $(INCLUDEDIR) + SCRIPTDIR= $(prefix)/lib + + # Detailed destination directories +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index a710d1fa6..9458ba5dd 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -16,8 +16,8 @@ CHECKSUM_SIZE="10431288" CHECKSUM_MD5="bcf93efa8eaf383c98ed3ce40b763497" CHECKSUM_RMD160="8efc73a01a466d8fa16c5c1734c89be79c2c538a" CHECKSUM_SHA512="e56e6cdd96ff7bcb680d11ad606c00f4264e413fc43ba7605b2d2e4a743fd6e464cbedabf18b461f742102e936f45d840302a99665b5f988b1df08b25285c238" -REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +REVISION="2" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" PATCHES="python-2.7.6.patchset" diff --git a/dev-libs/libxml2/libxml2-2.9.1.recipe b/dev-libs/libxml2/libxml2-2.9.1.recipe index 9c374179c..336ac21aa 100644 --- a/dev-libs/libxml2/libxml2-2.9.1.recipe +++ b/dev-libs/libxml2/libxml2-2.9.1.recipe @@ -3,9 +3,12 @@ HOMEPAGE="http://www.xmlsoft.org/" LICENSE="MIT" COPYRIGHT="1998-2013 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz" +CHECKSUM_SIZE="5172503" CHECKSUM_MD5="9c0cfef285d5c4a5c80d00904ddab380" -REVISION="1" -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" +CHECKSUM_RMD160="257285d9ac070ed9f58666b7bd7c4653651c871b" +CHECKSUM_SHA512="7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b" +REVISION="2" +ARCHITECTURES="!x86_gcc2 !x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" PATCHES="libxml2-2.9.1.patchset"