mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
Robert Yang
839568db9d
There are two major versions of the PCRE library. The newest version, PCRE2, was released in 2015 and is at version 10.22. The original, very widely deployed PCRE library, originally released in 1997, is at version 8.40, and the API and feature set are stable, future releases will be for bugfixes only. All new future features will be to PCRE2, not the original PCRE 8.x series. The newer vte depends on libpcre2, so add it. (From OE-Core rev: f7165d379cb67c4d4918a8a3e9509d3d823d61da) (From OE-Core rev: 69c4d94dd6b825c710c6e76fe77e5255ddd1183d) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
66 lines
1.9 KiB
Diff
66 lines
1.9 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>
|
|
|
|
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
|
|
## 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) $@
|
|
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
|
|
|
|
+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
|
|
|