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 7C3A059CA3 for ; Thu, 17 Mar 2016 20:50:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9C1921C006; Thu, 17 Mar 2016 20:50:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2D5C121C006 for ; Thu, 17 Mar 2016 20:50:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E115F340C44 for ; Thu, 17 Mar 2016 20:50:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D0A0847 for ; Thu, 17 Mar 2016 20:50:05 +0000 (UTC) From: "Dirkjan Ochtman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dirkjan Ochtman" Message-ID: <1458247755.7d94eb446eb6f800c4a3e3c3c6969a58fe291b53.djc@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/lxml/files/lxml-3.4.4-cross-compile.patch dev-python/lxml/files/lxml-3.5.0-cross-compile.patch X-VCS-Directories: dev-python/lxml/files/ X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman X-VCS-Revision: 7d94eb446eb6f800c4a3e3c3c6969a58fe291b53 X-VCS-Branch: master Date: Thu, 17 Mar 2016 20:50:05 +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: deb5e044-619f-4392-af25-cff631eca828 X-Archives-Hash: 945fd1be9d6f264deb38622212b808ed commit: 7d94eb446eb6f800c4a3e3c3c6969a58fe291b53 Author: Dirkjan Ochtman gentoo org> AuthorDate: Thu Mar 17 20:49:15 2016 +0000 Commit: Dirkjan Ochtman gentoo org> CommitDate: Thu Mar 17 20:49:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d94eb44 dev-python/lxml: fix bug in cross-compilation patch(es) dev-python/lxml/files/lxml-3.4.4-cross-compile.patch | 2 +- dev-python/lxml/files/lxml-3.5.0-cross-compile.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch index 7d1ed17..049b884 100644 --- a/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch +++ b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch @@ -30,7 +30,7 @@ use pkg-config to find libxml2/libxslt details rather than xxx-config scripts - xslt_flags = run_command(find_xslt_config(), "--%s" % option) + pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') + xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option) -+ xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option) ++ xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option) flag_list = xml2_flags.split() for flag in xslt_flags.split(): diff --git a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch index 54e4087..82a371c 100644 --- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch +++ b/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch @@ -33,7 +33,7 @@ index e04c38f..0549eaa 100644 - xslt_flags = run_command(find_xslt_config(), "--%s" % option) + pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config') + xml2_flags = run_command(pkg_config, 'libxml-2.0', '--%s' % option) -+ xslt_flags = run_command(pkg_config, 'libxxlt', '--%s' % option) ++ xslt_flags = run_command(pkg_config, 'libxslt', '--%s' % option) flag_list = xml2_flags.split() for flag in xslt_flags.split():