mirror of
https://git.yoctoproject.org/poky
synced 2026-05-05 20:27:58 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
261b8ddf5b
commit
68956c3a86
@@ -9,11 +9,11 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 38f1d41..2bde083 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -298,9 +298,21 @@ bin_SCRIPTS = pcre2-config
|
||||
Index: pcre2-10.30/Makefile.am
|
||||
===================================================================
|
||||
--- pcre2-10.30.orig/Makefile.am
|
||||
+++ pcre2-10.30/Makefile.am
|
||||
@@ -325,9 +325,21 @@ bin_SCRIPTS = pcre2-config
|
||||
## to copy a distributed set of tables that are defined for ASCII code. In this
|
||||
## case, dftables is not needed.
|
||||
|
||||
@@ -35,13 +35,13 @@ index 38f1d41..2bde083 100644
|
||||
src/pcre2_chartables.c: dftables$(EXEEXT)
|
||||
rm -f $@
|
||||
./dftables$(EXEEXT) $@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d7c57aa..d6eb0aa 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -59,6 +59,23 @@ then
|
||||
fi
|
||||
fi
|
||||
Index: pcre2-10.30/configure.ac
|
||||
===================================================================
|
||||
--- pcre2-10.30.orig/configure.ac
|
||||
+++ pcre2-10.30/configure.ac
|
||||
@@ -60,6 +60,23 @@ fi
|
||||
# This is a new thing required to stop a warning from automake 1.12
|
||||
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
|
||||
+if test x"$cross_compiling" = xyes; then
|
||||
+ CC_FOR_BUILD="${CC_FOR_BUILD-gcc}"
|
||||
|
||||
Reference in New Issue
Block a user