From 395a4c8aee0d8fb93ecfc43c3d8bfc680a3fd438 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:47:41 +0000 Subject: libxml: refresh patches The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: d71d6854fadc96fc3c75617af3beba02952fdef6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...run-the-python-tests-if-python-is-enabled.patch | 43 ++++++++++------------ 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'meta/recipes-core/libxml') diff --git a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch index d1ad55116a..2b92dbc8dc 100644 --- a/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch +++ b/meta/recipes-core/libxml/libxml2/0001-Make-ptest-run-the-python-tests-if-python-is-enabled.patch @@ -15,12 +15,12 @@ Signed-off-by: Peter Kjellerstedt python/tests/tstLastError.py | 2 +- 4 files changed, 21 insertions(+), 4 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index e181ee0..7960e7d 100644 ---- a/Makefile.am -+++ b/Makefile.am +Index: libxml2-2.9.7/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/Makefile.am ++++ libxml2-2.9.7/Makefile.am @@ -207,9 +207,9 @@ install-ptest: - install $(noinst_PROGRAMS) $(DESTDIR)) + install $(check_PROGRAMS) $(DESTDIR)) cp -r $(srcdir)/test $(DESTDIR) cp -r $(srcdir)/result $(DESTDIR) - cp -r $(srcdir)/python $(DESTDIR) @@ -28,13 +28,13 @@ index e181ee0..7960e7d 100644 sed -i -e 's|^Makefile:|_Makefile:|' $(DESTDIR)/Makefile + $(MAKE) -C python install-ptest - runtests: - [ -d test ] || $(LN_S) $(srcdir)/test . -diff --git a/python/Makefile.am b/python/Makefile.am -index 34aed96..ba3ec6a 100644 ---- a/python/Makefile.am -+++ b/python/Makefile.am -@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class.txt $(BUILT_SOURCES) + runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ + testchar$(EXEEXT) testdict$(EXEEXT) runxmlconf$(EXEEXT) +Index: libxml2-2.9.7/python/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/python/Makefile.am ++++ libxml2-2.9.7/python/Makefile.am +@@ -48,7 +48,16 @@ GENERATED = libxml2class.py libxml2class $(GENERATED): $(srcdir)/generator.py $(API_DESC) $(PYTHON) $(srcdir)/generator.py $(srcdir) @@ -51,10 +51,10 @@ index 34aed96..ba3ec6a 100644 +.PHONY: tests test tests test: all cd tests && $(MAKE) tests -diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am -index 95ebead..418e21e 100644 ---- a/python/tests/Makefile.am -+++ b/python/tests/Makefile.am +Index: libxml2-2.9.7/python/tests/Makefile.am +=================================================================== +--- libxml2-2.9.7.orig/python/tests/Makefile.am ++++ libxml2-2.9.7/python/tests/Makefile.am @@ -59,6 +59,11 @@ XMLS= \ CLEANFILES = core tmp.xml *.pyc @@ -81,10 +81,10 @@ index 95ebead..418e21e 100644 + tests: endif -diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py -index d5f9be7..3e5bef8 100755 ---- a/python/tests/tstLastError.py -+++ b/python/tests/tstLastError.py +Index: libxml2-2.9.7/python/tests/tstLastError.py +=================================================================== +--- libxml2-2.9.7.orig/python/tests/tstLastError.py ++++ libxml2-2.9.7/python/tests/tstLastError.py @@ -25,7 +25,7 @@ class TestCase(unittest.TestCase): when the exception is raised, check the libxml2.lastError for expected values.""" @@ -94,6 +94,3 @@ index d5f9be7..3e5bef8 100755 try: f(*args) except exc: --- -2.12.0 - -- cgit v1.2.3-54-g00ecf