| 1 |
commit: 451f8e10c06f460a403c8607de8aa14a55ef8727 |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 23 10:53:09 2015 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 23 10:53:41 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451f8e10 |
| 7 |
|
| 8 |
dev-libs/libxslt: update autoconf patch to avoid relying on environment |
| 9 |
|
| 10 |
Python eclass export PYTHON in environment so it enables python support even though it was not requested, see bug #566552. |
| 11 |
|
| 12 |
https://bugs.gentoo.org/show_bug.cgi?id=566552 |
| 13 |
|
| 14 |
Package-Manager: portage-2.2.25 |
| 15 |
|
| 16 |
.../files/libxslt-1.1.28-simplify-python.patch | 21 ++++++++++----------- |
| 17 |
1 file changed, 10 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch |
| 20 |
index 678b002..7cbaaf6 100644 |
| 21 |
--- a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch |
| 22 |
+++ b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-From 6fb632732a28fc5c5c8f20a7be8ded759acd8994 Mon Sep 17 00:00:00 2001 |
| 25 |
+From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001 |
| 26 |
From: Gilles Dartiguelongue <eva@g.o> |
| 27 |
Date: Wed, 11 Nov 2015 17:49:07 +0100 |
| 28 |
Subject: [PATCH] Simplify python setup in autoconf |
| 29 |
@@ -8,8 +8,8 @@ from the rest of the autoconf script. |
| 30 |
--- |
| 31 |
Makefile.am | 14 +++++-- |
| 32 |
configure.in | 119 ++++++++++++++--------------------------------------- |
| 33 |
- python/Makefile.am | 30 ++++---------- |
| 34 |
- 3 files changed, 49 insertions(+), 114 deletions(-) |
| 35 |
+ python/Makefile.am | 28 ++++--------- |
| 36 |
+ 3 files changed, 49 insertions(+), 112 deletions(-) |
| 37 |
|
| 38 |
diff --git a/Makefile.am b/Makefile.am |
| 39 |
index e357f19..c396913 100644 |
| 40 |
@@ -44,7 +44,7 @@ index e357f19..c396913 100644 |
| 41 |
valgrind: |
| 42 |
@echo '## Running the regression tests under Valgrind' |
| 43 |
diff --git a/configure.in b/configure.in |
| 44 |
-index e84ad4f..27c0e0e 100644 |
| 45 |
+index e84ad4f..102c733 100644 |
| 46 |
--- a/configure.in |
| 47 |
+++ b/configure.in |
| 48 |
@@ -291,90 +291,37 @@ dnl |
| 49 |
@@ -162,7 +162,7 @@ index e84ad4f..27c0e0e 100644 |
| 50 |
+ AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) |
| 51 |
+ ]) |
| 52 |
+ |
| 53 |
-+AM_CONDITIONAL([WITH_PYTHON], [test "$PYTHON" != ""]) |
| 54 |
++AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) |
| 55 |
+AC_SUBST([PYTHON_CFLAGS]) |
| 56 |
+AC_SUBST([PYTHON_LDFLAGS]) |
| 57 |
+AC_SUBST([PYTHON_LIBS]) |
| 58 |
@@ -181,7 +181,7 @@ index e84ad4f..27c0e0e 100644 |
| 59 |
XSLT_LIBDIR='-L${libdir}' |
| 60 |
XSLT_INCLUDEDIR='-I${includedir}' |
| 61 |
diff --git a/python/Makefile.am b/python/Makefile.am |
| 62 |
-index fa58b78..cc13c62 100644 |
| 63 |
+index fa58b78..3a5ecd6 100644 |
| 64 |
--- a/python/Makefile.am |
| 65 |
+++ b/python/Makefile.am |
| 66 |
@@ -5,9 +5,9 @@ SUBDIRS= . tests |
| 67 |
@@ -196,7 +196,7 @@ index fa58b78..cc13c62 100644 |
| 68 |
|
| 69 |
EXTRA_DIST = \ |
| 70 |
libxslt.c \ |
| 71 |
-@@ -16,43 +16,29 @@ EXTRA_DIST = \ |
| 72 |
+@@ -16,10 +16,7 @@ EXTRA_DIST = \ |
| 73 |
libxml_wrap.h \ |
| 74 |
libxslt_wrap.h \ |
| 75 |
libxsl.py \ |
| 76 |
@@ -208,11 +208,10 @@ index fa58b78..cc13c62 100644 |
| 77 |
|
| 78 |
if WITH_PYTHON |
| 79 |
mylibs = \ |
| 80 |
- $(top_builddir)/libxslt/libxslt.la \ |
| 81 |
- $(top_builddir)/libexslt/libexslt.la |
| 82 |
+@@ -28,31 +25,22 @@ mylibs = \ |
| 83 |
+ |
| 84 |
+ all-local: libxslt.py |
| 85 |
|
| 86 |
--all-local: libxslt.py |
| 87 |
-- |
| 88 |
-python_LTLIBRARIES = libxsltmod.la |
| 89 |
+python_PYTHON = libxslt.py |
| 90 |
+pyexec_LTLIBRARIES = libxsltmod.la |
Archives