4 files changed, 30 insertions, 25 deletions
diff --git a/packages/libpcre/files/native-rpath-link.patch b/packages/libpcre/files/native-rpath-link.patch
deleted file mode 100644
index 69de2bea64..0000000000
--- a/packages/libpcre/files/native-rpath-link.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: pcre-4.4/Makefile.in
-===================================================================
---- pcre-4.4.orig/Makefile.in	2003-08-21 11:43:07.000000000 +0100
-+++ pcre-4.4/Makefile.in	2008-03-19 10:34:08.000000000 +0000
-@@ -107,12 +107,12 @@
- 
- libpcre.la:     $(OBJ)
- 		-rm -f libpcre.la
--		$(LINKLIB) -rpath $(LIBDIR) -version-info \
-+		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) -version-info \
- 		'$(PCRELIBVERSION)' -o libpcre.la $(LOBJ)
- 
- libpcreposix.la: pcreposix.@OBJEXT@
- 		-rm -f libpcreposix.la
--		$(LINKLIB) -rpath $(LIBDIR) libpcre.la -version-info \
-+		$(LINKLIB) -rpath $(LIBDIR) -L$(LIBDIR) libpcre.la -version-info \
- 		'$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo
- 
- pcre.@OBJEXT@:  $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \
diff --git a/packages/libpcre/files/pcre-cross.patch b/packages/libpcre/files/pcre-cross.patch
new file mode 100644
index 0000000000..0626fb347a
--- /dev/null
+++ b/packages/libpcre/files/pcre-cross.patch
@@ -0,0 +1,25 @@
+To be upstreamable, this patch requires check for *_FOR_BUILD, otherwise
+it needs to pass special variables.
+
+It would be nice to implement per-target compiler specification to
+automake, as it is done for linker.
+
+Even better it would be nice to implement native build time targets in
+automake.
+
+Index: pcre-7.6/Makefile.am
+===================================================================
+--- pcre-7.6.orig/Makefile.am	2008-01-23 17:58:28.000000000 +0000
++++ pcre-7.6/Makefile.am	2008-04-03 22:32:00.000000000 +0000
+@@ -147,6 +147,11 @@
+ 
+ noinst_PROGRAMS += dftables
+ dftables_SOURCES = dftables.c
++dftables_LINK = $(LINK_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) $@
diff --git a/packages/libpcre/libpcre-native_4.4.bb b/packages/libpcre/libpcre-native_7.6.bb
index 1bbfde7f0a..20a4bdb978 100644
--- a/packages/libpcre/libpcre-native_4.4.bb
+++ b/packages/libpcre/libpcre-native_7.6.bb
@@ -7,8 +7,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
 # NOTE: consider defining PREFERRED_PROVIDER_pcre
 PROVIDES = ""
 
-SRC_URI += "file://native-rpath-link.patch;patch=1"
-
 do_compile () {
 	# The generation of dftables can lead to timestamp problems with ccache
 	# because the generated config.h seems newer.  It is sufficient to ensure that the
diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_7.6.bb
index 517256a0ff..3171e10e68 100644
--- a/packages/libpcre/libpcre_4.4.bb
+++ b/packages/libpcre/libpcre_7.6.bb
@@ -5,9 +5,10 @@ provides a POSIX calling interface to PCRE; the regular expressions \
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r8"
+PR = "r1"
 LICENSE = "BSD"
-SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
+           file://pcre-cross.patch;patch=1"
 S = "${WORKDIR}/pcre-${PV}"
 
 PROVIDES = "pcre"
@@ -18,7 +19,7 @@ PARALLEL_MAKE = ""
 
 LEAD_SONAME = "libpcre.so"
 CFLAGS_append = " -D_REENTRANT"
-EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000"
+EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000 --enable-rebuild-chartables --enable-utf8"
 
 do_compile () {
 	# stop libtool from trying to link with host libraries - fix from #33
@@ -29,7 +30,7 @@ do_compile () {
 	# because the generated config.h seems newer.  It is sufficient to ensure that the
 	# attempt to build dftables inside make will actually work (foo_FOR_BUILD is
 	# only used for this).
-	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC}"
+	oe_runmake CC_FOR_BUILD="${BUILD_CC}" CFLAGS_FOR_BUILD="-DLINK_SIZE=2 -I${S}/include" LINK_FOR_BUILD="${BUILD_CC} -L${S}/lib"
 }
 
 do_stage () {