From 7d9730fa94c166bd52729d19251362b4696b8e76 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Sat, 13 Jan 2018 18:02:37 +0800 Subject: libxml2: fix makefile for ptests Changes to Makefile in latest version mean when "make -k runtests" is executed, it leads to errors like: | make: *** No rule to make target 'runtest.c', needed by 'runtest.o'. | make: *** No rule to make target 'SAX.c', needed by 'SAX.lo'. | make: *** No rule to make target 'entities.c', needed by 'entities.lo'. | make: *** No rule to make target 'encoding.c', needed by 'encoding.lo'. Make sure that we don't try to check and compile the tests again on the target. (From OE-Core rev: 5cf92ca436e1a1ba60fec8b30b6cb3cfd4842bc8) (From OE-Core rev: 833164ff0d0a767f82291e3d8eacc4b4832470a4) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- .../libxml/libxml2/fix-execution-of-ptests.patch | 21 +++++++++++++++++++++ meta/recipes-core/libxml/libxml2_2.9.5.bb | 1 + 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch diff --git a/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch b/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch new file mode 100644 index 0000000000..51a9e1935f --- /dev/null +++ b/meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch @@ -0,0 +1,21 @@ +Make sure that Makefile doesn't try to compile these tests again +on the target where the source dependencies won't be available. + +Upstream-Status: Inappropriate [cross-compile specific] + +Signed-off-by: Anuj Mittal + +Index: libxml2-2.9.7/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/Makefile.am ++++ libxml2-2.9.7/Makefile.am +@@ -211,8 +211,7 @@ install-ptest: + sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile + $(MAKE) -C python install-ptest + +-runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ +- testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) ++runtests: + [ -d test ] || $(LN_S) $(srcdir)/test . + [ -d result ] || $(LN_S) $(srcdir)/result . + $(CHECKER) ./runtest$(EXEEXT) && \ diff --git a/meta/recipes-core/libxml/libxml2_2.9.5.bb b/meta/recipes-core/libxml/libxml2_2.9.5.bb index df060d7266..27e1a8e7b1 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.5.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.5.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ file://python-sitepackages-dir.patch \ file://libxml-m4-use-pkgconfig.patch \ file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ + file://fix-execution-of-ptests.patch \ " SRC_URI[libtar.md5sum] = "5ce0da9bdaa267b40c4ca36d35363b8b" -- cgit v1.2.3-54-g00ecf