diff options
author | Fahad Usman <fahad_usman@mentor.com> | 2012-12-10 19:51:21 +0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-13 15:18:43 +0000 |
commit | 9820786bbaf51fca38cf6ec90de623b8420500e1 (patch) | |
tree | f507b5c923a231946a9bc34d576e239c67b83d90 /meta/recipes-support/libpcre/files | |
parent | f615f0c140aa0748a16bb34ad5c19d828bd57ea2 (diff) | |
download | poky-9820786bbaf51fca38cf6ec90de623b8420500e1.tar.gz |
libpcre: Improve the recipe
- 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>
Diffstat (limited to 'meta/recipes-support/libpcre/files')
-rw-r--r-- | meta/recipes-support/libpcre/files/pcre-cross.patch | 53 |
1 files changed, 37 insertions, 16 deletions
diff --git a/meta/recipes-support/libpcre/files/pcre-cross.patch b/meta/recipes-support/libpcre/files/pcre-cross.patch index 2ae05a12ca..83880f7098 100644 --- a/meta/recipes-support/libpcre/files/pcre-cross.patch +++ b/meta/recipes-support/libpcre/files/pcre-cross.patch | |||
@@ -1,23 +1,19 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise | 3 | --- pcre-8.32.orig/Makefile.am |
4 | it needs to pass special variables. | 4 | +++ pcre-8.32/Makefile.am |
5 | 5 | @@ -197,8 +197,18 @@ bin_SCRIPTS = pcre-config | |
6 | It would be nice to implement per-target compiler specification to | 6 | |
7 | automake, as it is done for linker. | 7 | +CC_FOR_BUILD = @CC_FOR_BUILD@ |
8 | 8 | +CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ | |
9 | Even better it would be nice to implement native build time targets in | 9 | +CCLD_FOR_BUILD = @CCLD_FOR_BUILD@ |
10 | automake. | 10 | +LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ |
11 | 11 | + | |
12 | Index: pcre-7.6/Makefile.am | 12 | if WITH_REBUILD_CHARTABLES |
13 | =================================================================== | ||
14 | --- pcre-7.6.orig/Makefile.am 2008-01-23 17:58:28.000000000 +0000 | ||
15 | +++ pcre-7.6/Makefile.am 2008-04-03 22:32:00.000000000 +0000 | ||
16 | @@ -147,6 +147,11 @@ | ||
17 | 13 | ||
18 | noinst_PROGRAMS += dftables | 14 | noinst_PROGRAMS += dftables |
19 | dftables_SOURCES = dftables.c | 15 | dftables_SOURCES = dftables.c |
20 | +dftables_LINK = $(LINK_FOR_BUILD) -o $@ | 16 | +dftables_LINK = $(CCLD_FOR_BUILD) -o $@ |
21 | +dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) | 17 | +dftables_LDFLAGS = $(LDFLAGS_FOR_BUILD) |
22 | + | 18 | + |
23 | +dftables.o: $(srcdir)/dftables.c | 19 | +dftables.o: $(srcdir)/dftables.c |
@@ -25,3 +21,28 @@ Index: pcre-7.6/Makefile.am | |||
25 | 21 | ||
26 | pcre_chartables.c: dftables$(EXEEXT) | 22 | pcre_chartables.c: dftables$(EXEEXT) |
27 | ./dftables$(EXEEXT) $@ | 23 | ./dftables$(EXEEXT) $@ |
24 | --- pcre-8.32.orig/configure.ac | ||
25 | +++ pcre-8.32/configure.ac | ||
26 | @@ -72,6 +72,22 @@ then | ||
27 | fi | ||
28 | fi | ||
29 | |||
30 | +if test x"$cross_compiling" = xyes; then | ||
31 | + CC_FOR_BUILD="${CC_FOR_BUILD-gcc}" | ||
32 | + CCLD_FOR_BUILD="${CCLD_FOR_BUILD-gcc}" | ||
33 | + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD}" | ||
34 | + LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD}" | ||
35 | +else | ||
36 | + CC_FOR_BUILD="${CC_FOR_BUILD-\$(CC)}" | ||
37 | + CCLD_FOR_BUILD="${CCLD_FOR_BUILD-\$(CCLD)}" | ||
38 | + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-\$(CFLAGS)}" | ||
39 | + LDFLAGS_FOR_BUILD="${LDFLAGS_FOR_BUILD-\$(LDFLAGS)}" | ||
40 | +fi | ||
41 | +AC_ARG_VAR(CC_FOR_BUILD, [build system C compiler]) | ||
42 | +AC_ARG_VAR(CCLD_FOR_BUILD, [build system C linker frontend]) | ||
43 | +AC_ARG_VAR(CFLAGS_FOR_BUILD, [build system C compiler arguments]) | ||
44 | +AC_ARG_VAR(LDFLAGS_FOR_BUILD, [build system C linker frontend arguments]) | ||
45 | + | ||
46 | # AC_PROG_CXX will return "g++" even if no c++ compiler is installed. | ||
47 | # Check for that case, and just disable c++ code if g++ doesn't run. | ||
48 | AC_LANG_PUSH(C++) | ||