summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/lxml/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/lxml/files')
-rw-r--r--dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch14
-rw-r--r--dev-python/lxml/files/lxml-3.4.4-cross-compile.patch36
2 files changed, 50 insertions, 0 deletions
diff --git a/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch b/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch
new file mode 100644
index 000000000000..3c8667a4f497
--- /dev/null
+++ b/dev-python/lxml/files/lxml-3.3.x-test_etree.py.patch
@@ -0,0 +1,14 @@
+--- build/lib/lxml/tests/test_etree.py.orig 2015-03-15 17:01:51.337909343 +0100
++++ build/lib/lxml/tests/test_etree.py 2015-03-15 17:04:25.059318388 +0100
+@@ -1225,6 +1225,11 @@
+ root[0].attrib, {'default': 'valueB'})
+
+ def test_resolve_filename_dtd_relative(self):
++ # This test is broken as it tries to resolve a file path
++ # with the file:// path convention and will fail.
++ # So let's not waste our time here and return straight away.
++ return
++
+ parse = self.etree.parse
+ parser = self.etree.XMLParser(attribute_defaults=True)
+ assertEqual = self.assertEqual
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
new file mode 100644
index 000000000000..7d1ed178d615
--- /dev/null
+++ b/dev-python/lxml/files/lxml-3.4.4-cross-compile.patch
@@ -0,0 +1,36 @@
+use pkg-config to find libxml2/libxslt details rather than xxx-config scripts
+
+--- a/setupinfo.py
++++ b/setupinfo.py
+@@ -87,19 +87,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")
+-
+ _include_dirs = include_dirs(static_include_dirs)
+ _library_dirs = library_dirs(static_library_dirs)
+ _cflags = cflags(static_cflags)
+@@ -310,8 +297,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, 'libxxlt', '--%s' % option)
+
+ flag_list = xml2_flags.split()
+ for flag in xslt_flags.split():