From e109e6bd7f5d6dff035edb6851c532edeb5d1a02 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Mar 2018 20:17:27 +0200 Subject: nspr: 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: 684a2533a2b25b900e12f7da912a2c729d60b69d) Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch | 2 +- meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch index c2b7258e50..f12acc8548 100644 --- a/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch +++ b/meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch @@ -49,4 +49,4 @@ Index: nspr/configure.in - PR_MD_ASFILES=os_Linux_ppc.s fi ;; - m68k) + esac diff --git a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch index a7e7853de1..ecc6d31874 100644 --- a/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch +++ b/meta/recipes-support/nspr/nspr/remove-rpath-from-tests.patch @@ -11,12 +11,12 @@ in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-sp Signed-off-by: Andrei Gherzan Upstream-Status: Pending -Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in +Index: nspr/pr/tests/Makefile.in =================================================================== ---- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 -+++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 -@@ -379,7 +379,7 @@ - endif +--- nspr.orig/pr/tests/Makefile.in ++++ nspr/pr/tests/Makefile.in +@@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) + endif # SunOS ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) -- cgit v1.2.3-54-g00ecf