From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- .../lxml/files/lxml-3.5.0-cross-compile.patch | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 dev-python/lxml/files/lxml-3.5.0-cross-compile.patch (limited to 'dev-python/lxml/files') 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 deleted file mode 100644 index 82a371c72978..000000000000 --- a/dev-python/lxml/files/lxml-3.5.0-cross-compile.patch +++ /dev/null @@ -1,39 +0,0 @@ - setupinfo.py | 18 +++--------------- - 1 file changed, 3 insertions(+), 15 deletions(-) - -diff --git a/setupinfo.py b/setupinfo.py -index e04c38f..0549eaa 100644 ---- a/setupinfo.py -+++ b/setupinfo.py -@@ -93,19 +93,6 @@ def ext_modules(static_include_dirs, static_library_dirs, - source_extension = ".c" - print("Building without Cython.") - -- lib_versions = get_library_versions() -- versions_ok = True -- if lib_versions[0]: -- print("Using build configuration of libxml2 %s and libxslt %s" % -- lib_versions) -- versions_ok = check_min_version(lib_versions[0], (2, 7, 0), 'libxml2') -- else: -- print("Using build configuration of libxslt %s" % -- lib_versions[1]) -- versions_ok |= check_min_version(lib_versions[1], (1, 1, 23), 'libxslt') -- if not versions_ok: -- raise RuntimeError("Dependency missing") -- - base_dir = get_base_dir() - _include_dirs = _prefer_reldirs( - base_dir, include_dirs(static_include_dirs) + [INCLUDE_PACKAGE_PATH]) -@@ -358,8 +345,9 @@ def get_library_versions(): - - - def flags(option): -- xml2_flags = run_command(find_xml2_config(), "--%s" % option) -- 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, 'libxslt', '--%s' % option) - - flag_list = xml2_flags.split() - for flag in xslt_flags.split(): -- cgit v1.2.3