diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-01-13 18:02:37 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-19 10:54:55 +0100 |
commit | 7d9730fa94c166bd52729d19251362b4696b8e76 (patch) | |
tree | 1aa61c14ebf46c60d50539d9c2a42ee9839629ea | |
parent | c184cb1ad4343215ec564adfdcc87f7b3ad98c51 (diff) | |
download | poky-7d9730fa94c166bd52729d19251362b4696b8e76.tar.gz |
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 <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/libxml/libxml2/fix-execution-of-ptests.patch | 21 | ||||
-rw-r--r-- | meta/recipes-core/libxml/libxml2_2.9.5.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.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 \ | |||
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] = "5ce0da9bdaa267b40c4ca36d35363b8b" | 26 | SRC_URI[libtar.md5sum] = "5ce0da9bdaa267b40c4ca36d35363b8b" |