[oe-commits] [openembedded-core] 06/43: nspr: refresh patches

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 684a2533a2b25b900e12f7da912a2c729d60b69d
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Thu Mar 8 20:17:27 2018 +0200

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 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(-)

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 c2b7258..f12acc8 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 a7e7853..ecc6d31 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 <andrei at gherzan.ro>
 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.