diff options
| author | Ross Burton <ross.burton@intel.com> | 2017-11-15 16:40:47 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-07 06:34:51 -0800 |
| commit | 68956c3a8651cb6dedaac625b5485eb32e8df29a (patch) | |
| tree | 86e9f07e2294a563eb4dab2eda18613d80d2a702 /meta | |
| parent | 261b8ddf5b5492cc8e89057a123e05418bd2145f (diff) | |
| download | poky-68956c3a8651cb6dedaac625b5485eb32e8df29a.tar.gz | |
libpcre: 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: eb7632f593b81066da4de44bc001974d6726a118)
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/libpcre/libpcre2/pcre-cross.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch b/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch index 9516caf51a..871cdfcb7d 100644 --- a/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch +++ b/meta/recipes-support/libpcre/libpcre2/pcre-cross.patch | |||
| @@ -9,11 +9,11 @@ Upstream-Status: Pending | |||
| 9 | 9 | ||
| 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 11 | 11 | ||
| 12 | diff --git a/Makefile.am b/Makefile.am | 12 | Index: pcre2-10.30/Makefile.am |
| 13 | index 38f1d41..2bde083 100644 | 13 | =================================================================== |
| 14 | --- a/Makefile.am | 14 | --- pcre2-10.30.orig/Makefile.am |
| 15 | +++ b/Makefile.am | 15 | +++ pcre2-10.30/Makefile.am |
| 16 | @@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config | 16 | @@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config |
| 17 | ## to copy a distributed set of tables that are defined for ASCII code. In this | 17 | ## to copy a distributed set of tables that are defined for ASCII code. In this |
| 18 | ## case, dftables is not needed. | 18 | ## case, dftables is not needed. |
| 19 | 19 | ||
| @@ -35,13 +35,13 @@ index 38f1d41..2bde083 100644 | |||
| 35 | src/pcre2_chartables.c: dftables$(EXEEXT) | 35 | src/pcre2_chartables.c: dftables$(EXEEXT) |
| 36 | rm -f $@ | 36 | rm -f $@ |
| 37 | ./dftables$(EXEEXT) $@ | 37 | ./dftables$(EXEEXT) $@ |
| 38 | diff --git a/configure.ac b/configure.ac | 38 | Index: pcre2-10.30/configure.ac |
| 39 | index d7c57aa..d6eb0aa 100644 | 39 | =================================================================== |
| 40 | --- a/configure.ac | 40 | --- pcre2-10.30.orig/configure.ac |
| 41 | +++ b/configure.ac | 41 | +++ pcre2-10.30/configure.ac |
| 42 | @@ -59,6 +59,23 @@ then | 42 | @@ -60,6 +60,23 @@ fi |
| 43 | fi | 43 | # This is a new thing required to stop a warning from automake 1.12 |
| 44 | fi | 44 | m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
| 45 | 45 | ||
| 46 | +if test x"$cross_compiling" = xyes; then | 46 | +if test x"$cross_compiling" = xyes; then |
| 47 | + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" | 47 | + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" |