| 1 |
commit: be2fe913ffa1d4acfeeba02f88adfb3d06481095 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 11:58:28 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 11:58:44 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2fe913 |
| 7 |
|
| 8 |
dev-libs/libxml2: Fix python ABI detection |
| 9 |
|
| 10 |
Gentoo recently moved closer to upstream in terms of naming python |
| 11 |
with regards to the build ABI. This patch adopts the buildsystem |
| 12 |
to this change |
| 13 |
|
| 14 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567066 |
| 15 |
|
| 16 |
Package-Manager: portage-2.2.25 |
| 17 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 18 |
|
| 19 |
.../libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch | 16 ++++++++++++++++ |
| 20 |
dev-libs/libxml2/libxml2-2.9.2-r4.ebuild | 2 ++ |
| 21 |
2 files changed, 18 insertions(+) |
| 22 |
|
| 23 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch |
| 24 |
new file mode 100644 |
| 25 |
index 0000000..14dd5bc |
| 26 |
--- /dev/null |
| 27 |
+++ b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch |
| 28 |
@@ -0,0 +1,16 @@ |
| 29 |
+ configure.ac | 2 +- |
| 30 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 31 |
+ |
| 32 |
+diff --git a/configure.ac b/configure.ac |
| 33 |
+index 14ac0a8..f787b12 100644 |
| 34 |
+--- a/configure.ac |
| 35 |
++++ b/configure.ac |
| 36 |
+@@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then |
| 37 |
+ fi |
| 38 |
+ if test "$PYTHON" != "" |
| 39 |
+ then |
| 40 |
+- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` |
| 41 |
++ PYTHON_VERSION=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('LDVERSION') or sysconfig.get_config_var('py_version_short'))"` |
| 42 |
+ PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` |
| 43 |
+ # does not work as it produce a /usr/lib/python path instead of/usr/lib64/python |
| 44 |
+ # |
| 45 |
|
| 46 |
diff --git a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild |
| 47 |
index d1f80f0..421a205 100644 |
| 48 |
--- a/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild |
| 49 |
+++ b/dev-libs/libxml2/libxml2-2.9.2-r4.ebuild |
| 50 |
@@ -90,6 +90,8 @@ src_prepare() { |
| 51 |
# https://bugs.gentoo.org/show_bug.cgi?id=738751 |
| 52 |
epatch "${FILESDIR}"/${PN}-2.9.2-icu-pkgconfig.patch |
| 53 |
|
| 54 |
+ epatch "${FILESDIR}"/${P}-python-ABIFLAG.patch |
| 55 |
+ |
| 56 |
# Important patches from master |
| 57 |
epatch \ |
| 58 |
"${FILESDIR}"/${PN}-2.9.2-revert-missing-initialization.patch \ |
Archives