diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-03-08 20:17:27 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-09 09:17:02 -0800 |
| commit | e109e6bd7f5d6dff035edb6851c532edeb5d1a02 (patch) | |
| tree | 962a25a28634cddfa981adccfb3c24aa33195955 /meta | |
| parent | 00cb0ff014bc38abd971a475af4aa7787a058d53 (diff) | |
| download | poky-e109e6bd7f5d6dff035edb6851c532edeb5d1a02.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/nspr/nspr/fix-build-on-x86_64.patch | 2 | ||||
| -rw-r--r-- | 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 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 | |||
| 49 | - PR_MD_ASFILES=os_Linux_ppc.s | 49 | - PR_MD_ASFILES=os_Linux_ppc.s |
| 50 | fi | 50 | fi |
| 51 | ;; | 51 | ;; |
| 52 | m68k) | 52 | 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 | |||
| 11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | 11 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> |
| 12 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
| 13 | 13 | ||
| 14 | Index: nspr-4.8.9/mozilla/nsprpub/pr/tests/Makefile.in | 14 | Index: nspr/pr/tests/Makefile.in |
| 15 | =================================================================== | 15 | =================================================================== |
| 16 | --- nsprpub.orig/pr/tests/Makefile.in 2012-02-11 00:01:10.476220505 +0200 | 16 | --- nspr.orig/pr/tests/Makefile.in |
| 17 | +++ nsprpub/pr/tests/Makefile.in 2012-02-10 23:57:40.000000000 +0200 | 17 | +++ nspr/pr/tests/Makefile.in |
| 18 | @@ -379,7 +379,7 @@ | 18 | @@ -315,7 +315,7 @@ ifeq ($(OS_ARCH), SunOS) |
| 19 | endif | 19 | endif # SunOS |
| 20 | 20 | ||
| 21 | ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) | 21 | ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) |
| 22 | - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) | 22 | - LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR) |