From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6EE941384B4 for ; Mon, 23 Nov 2015 10:53:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A187721C0B0; Mon, 23 Nov 2015 10:53:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AE8021C0B0 for ; Mon, 23 Nov 2015 10:53:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EAD6D340504 for ; Mon, 23 Nov 2015 10:53:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 308C7A95 for ; Mon, 23 Nov 2015 10:53:48 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1448276021.451f8e10c06f460a403c8607de8aa14a55ef8727.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch X-VCS-Directories: dev-libs/libxslt/files/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 451f8e10c06f460a403c8607de8aa14a55ef8727 X-VCS-Branch: master Date: Mon, 23 Nov 2015 10:53:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2a3e4bf7-acaf-48cf-9db7-447859fe6c76 X-Archives-Hash: 1f6edacdf6e09f221e4e7f3653e2fb16 commit: 451f8e10c06f460a403c8607de8aa14a55ef8727 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Nov 23 10:53:09 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Nov 23 10:53:41 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451f8e10 dev-libs/libxslt: update autoconf patch to avoid relying on environment Python eclass export PYTHON in environment so it enables python support even though it was not requested, see bug #566552. https://bugs.gentoo.org/show_bug.cgi?id=566552 Package-Manager: portage-2.2.25 .../files/libxslt-1.1.28-simplify-python.patch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) 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 index 678b002..7cbaaf6 100644 --- a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch +++ b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch @@ -1,4 +1,4 @@ -From 6fb632732a28fc5c5c8f20a7be8ded759acd8994 Mon Sep 17 00:00:00 2001 +From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 11 Nov 2015 17:49:07 +0100 Subject: [PATCH] Simplify python setup in autoconf @@ -8,8 +8,8 @@ from the rest of the autoconf script. --- Makefile.am | 14 +++++-- configure.in | 119 ++++++++++++++--------------------------------------- - python/Makefile.am | 30 ++++---------- - 3 files changed, 49 insertions(+), 114 deletions(-) + python/Makefile.am | 28 ++++--------- + 3 files changed, 49 insertions(+), 112 deletions(-) diff --git a/Makefile.am b/Makefile.am index e357f19..c396913 100644 @@ -44,7 +44,7 @@ index e357f19..c396913 100644 valgrind: @echo '## Running the regression tests under Valgrind' diff --git a/configure.in b/configure.in -index e84ad4f..27c0e0e 100644 +index e84ad4f..102c733 100644 --- a/configure.in +++ b/configure.in @@ -291,90 +291,37 @@ dnl @@ -162,7 +162,7 @@ index e84ad4f..27c0e0e 100644 + AC_MSG_WARN([libxml2 python module not found, expect runtime errors])]) + ]) + -+AM_CONDITIONAL([WITH_PYTHON], [test "$PYTHON" != ""]) ++AM_CONDITIONAL([WITH_PYTHON], [test "$with_python" = "yes"]) +AC_SUBST([PYTHON_CFLAGS]) +AC_SUBST([PYTHON_LDFLAGS]) +AC_SUBST([PYTHON_LIBS]) @@ -181,7 +181,7 @@ index e84ad4f..27c0e0e 100644 XSLT_LIBDIR='-L${libdir}' XSLT_INCLUDEDIR='-I${includedir}' diff --git a/python/Makefile.am b/python/Makefile.am -index fa58b78..cc13c62 100644 +index fa58b78..3a5ecd6 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -5,9 +5,9 @@ SUBDIRS= . tests @@ -196,7 +196,7 @@ index fa58b78..cc13c62 100644 EXTRA_DIST = \ libxslt.c \ -@@ -16,43 +16,29 @@ EXTRA_DIST = \ +@@ -16,10 +16,7 @@ EXTRA_DIST = \ libxml_wrap.h \ libxslt_wrap.h \ libxsl.py \ @@ -208,11 +208,10 @@ index fa58b78..cc13c62 100644 if WITH_PYTHON mylibs = \ - $(top_builddir)/libxslt/libxslt.la \ - $(top_builddir)/libexslt/libexslt.la +@@ -28,31 +25,22 @@ mylibs = \ + + all-local: libxslt.py --all-local: libxslt.py -- -python_LTLIBRARIES = libxsltmod.la +python_PYTHON = libxslt.py +pyexec_LTLIBRARIES = libxsltmod.la