diff options
| -rw-r--r-- | meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.7.bb | 1 |
2 files changed, 22 insertions, 0 deletions
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 @@ | |||
| 1 | Make sure that Makefile doesn't try to compile these tests again | ||
| 2 | on the target where the source dependencies won't be available. | ||
| 3 | |||
| 4 | Upstream-Status: Inappropriate [cross-compile specific] | ||
| 5 | |||
| 6 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
| 7 | |||
| 8 | Index: libxml2-2.9.7/Makefile.am | ||
| 9 | =================================================================== | ||
| 10 | --- libxml2-2.9.7.orig/Makefile.am | ||
| 11 | +++ libxml2-2.9.7/Makefile.am | ||
| 12 | @@ -211,8 +211,7 @@ install-ptest: | ||
| 13 | sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile | ||
| 14 | $(MAKE) -C python install-ptest | ||
| 15 | |||
| 16 | -runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ | ||
| 17 | - testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) | ||
| 18 | +runtests: | ||
| 19 | [ -d test ] || $(LN_S) $(srcdir)/test . | ||
| 20 | [ -d result ] || $(LN_S) $(srcdir)/result . | ||
| 21 | $(CHECKER) ./runtest$(EXEEXT) && \ | ||
diff --git a/meta/recipes-core/libxml/libxml2_2.9.7.bb b/meta/recipes-core/libxml/libxml2_2.9.7.bb index 996e671ae0..85bfecae88 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.7.bb +++ b/meta/recipes-core/libxml/libxml2_2.9.7.bb | |||
| @@ -20,6 +20,7 @@ SRC_URI = "http://www.xmlsoft.org/sources/libxml2-${PV}.tar.gz;name=libtar \ | |||
| 20 | file://python-sitepackages-dir.patch \ | 20 | file://python-sitepackages-dir.patch \ |
| 21 | file://libxml-m4-use-pkgconfig.patch \ | 21 | file://libxml-m4-use-pkgconfig.patch \ |
| 22 | file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ | 22 | file://0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch \ |
| 23 | file://fix-execution-of-ptests.patch \ | ||
| 23 | " | 24 | " |
| 24 | 25 | ||
| 25 | SRC_URI[libtar.md5sum] = "896608641a08b465098a40ddf51cefba" | 26 | SRC_URI[libtar.md5sum] = "896608641a08b465098a40ddf51cefba" |
