mirror of
git://git.yoctoproject.org/poky
synced 2026-10-02 14:39:44 +00:00
68956c3a86
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>
66 lines
2.1 KiB
Diff
66 lines
2.1 KiB
Diff
Fix for cross compiling
|
|
|
|
Fixed:
|
|
| ./dftables src/pcre2_chartables.c
|
|
| make: ./dftables: Command not found
|
|
| make: *** [src/pcre2_chartables.c] Error 127
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
|
|
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.
|
|
|
|
+CC_FOR_BUILD = @CC_FOR_BUILD@
|
|
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
|
+CCLD_FOR_BUILD = @CCLD_FOR_BUILD@
|
|
+LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
|
|
+
|
|
if WITH_REBUILD_CHARTABLES
|
|
noinst_PROGRAMS += dftables
|
|
dftables_SOURCES = src/dftables.c
|
|
+
|
|
+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
|
|
+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
|
|
+
|
|
+src/dftables.o: $(srcdir)/src/dftables.c
|
|
+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/src/dftables.c
|
|
+
|
|
src/pcre2_chartables.c: dftables$(EXEEXT)
|
|
rm -f $@
|
|
./dftables$(EXEEXT) $@
|
|
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}"
|
|
+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}"
|
|
+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}"
|
|
+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}"
|
|
+else
|
|
+ CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}"
|
|
+ CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}"
|
|
+ CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}"
|
|
+ LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}"
|
|
+fi
|
|
+AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler])
|
|
+AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend])
|
|
+AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments])
|
|
+AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments])
|
|
+
|
|
+
|
|
# Check for a 64-bit integer type
|
|
AC_TYPE_INT64_T
|
|
|