mirror of
https://git.yoctoproject.org/poky
synced 2026-09-12 15:49:36 +02:00
9820786bba
- Improve the cross patch to determine *_FOR_BUILD in configure - Leverage the fact that autotools.bbclass handles *_FOR_BUILD now - Drop the now unnecessary do_compile override - Drop the do_split_packages - Split out packages for pcregrep, pcretest, in addition to libpcrecpp and libpcreposix - add nativesdk to BBCLASSEXTEND as well as native (From OE-Core rev: 9867a9ad7a80a26654326650752dbbe89c8de3c5) Signed-off-by: Christopher Larson <chris_larson@mentor.com> - the patch was imported from meta-mentor layer on yoctoproject git server http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id 62f819b97e356c1d7468fbccbf3a3ceed78b09a8 - broken up the original patch in two parts, this part contains some improvements to the recipe and the cross patch Signed-off-by: Fahad Usman <fahad_usman@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
Upstream-Status: Pending
|
|
|
|
--- pcre-8.32.orig/Makefile.am
|
|
+++ pcre-8.32/Makefile.am
|
|
@@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config
|
|
|
|
+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 = dftables.c
|
|
+dftables_LINK = $(CCLD_FOR_BUILD) -o $@
|
|
+dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD)
|
|
+
|
|
+dftables.o: $(srcdir)/dftables.c
|
|
+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/dftables.c
|
|
|
|
pcre_chartables.c: dftables$(EXEEXT)
|
|
./dftables$(EXEEXT) $@
|
|
--- pcre-8.32.orig/configure.ac
|
|
+++ pcre-8.32/configure.ac
|
|
@@ -72,6 +72,22 @@ 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])
|
|
+
|
|
# AC_PROG_CXX will return "g++" even if no c++ compiler is installed.
|
|
# Check for that case, and just disable c++ code if g++ doesn't run.
|
|
AC_LANG_PUSH(C++)
|