commit: c00985c576a4af05b6cc871fe63f93a6537bb20e Author: Mike Frysinger <vapier <AT> chromium <DOT> org> AuthorDate: Thu Jan 3 10:52:31 2019 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Thu Jan 3 10:54:21 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c00985c5
dev-libs/libxml2: fix reader5.py test #565576 Closes: https://bugs.gentoo.org/565576 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> .../files/libxml2-2.9.8-out-of-tree-test.patch | 40 ++++++++++++++++++++++ dev-libs/libxml2/libxml2-2.9.8.ebuild | 3 ++ 2 files changed, 43 insertions(+) diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch new file mode 100644 index 00000000000..fcc441d05de --- /dev/null +++ b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch @@ -0,0 +1,40 @@ +https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 + +From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <[email protected]> +Date: Thu, 3 Jan 2019 05:44:03 -0500 +Subject: [PATCH] fix reader5.py test when building out of tree + +When building out of tree, the relative path this test uses doesn't +work. Resolve the path relative to the test script itself instead. + +Url: https://bugs.gentoo.org/565576 +--- + python/tests/reader5.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/python/tests/reader5.py b/python/tests/reader5.py +index 82d0daea474a..da5355ffc4c6 100755 +--- a/python/tests/reader5.py ++++ b/python/tests/reader5.py +@@ -4,6 +4,7 @@ + # this extract the Dragon bibliography entries from the XML specification + # + import libxml2 ++import os + import sys + + # Memory debug specific +@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. + <emph>Compilers: Principles, Techniques, and Tools</emph>. + Reading: Addison-Wesley, 1986, rpt. corr. 1988.</bibl>""" + +-f = open('../../test/valid/REC-xml-19980210.xml', 'rb') ++basedir = os.path.dirname(os.path.realpath(__file__)) ++f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') + input = libxml2.inputBuffer(f) + reader = input.newTextReader("REC") + res="" +-- +2.19.1 + diff --git a/dev-libs/libxml2/libxml2-2.9.8.ebuild b/dev-libs/libxml2/libxml2-2.9.8.ebuild index 1917e19e628..fbb37285cb7 100644 --- a/dev-libs/libxml2/libxml2-2.9.8.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.8.ebuild @@ -81,6 +81,9 @@ src_prepare() { # https://bugzilla.gnome.org/show_bug.cgi?id=760458 eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch + # Fix python tests when building out of tree #565576 + eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch + if [[ ${CHOST} == *-darwin* ]] ; then # Avoid final linking arguments for python modules sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
