[oe-commits] org.oe.dev Update of libpcre to version 7.6:

[utx commit]

Update of libpcre to version 7.6:
* new major branch, new features
* required for new goffice
* uses automake, native-rpath-link.patch is no more needed
* enabled UTF-8 for target build (required for new goffice)

Author: utx at openembedded.org
Branch: org.openembedded.dev
Revision: 74a86bc83da99adde4ae4d45ad98dcb682d01f22
ViewMTN: http://monotone.openembedded.org/revision/info/74a86bc83da99adde4ae4d45ad98dcb682d01f22
Files:
1
packages/libpcre/files/native-rpath-link.patch
packages/libpcre/libpcre-native_4.4.bb
packages/libpcre/libpcre-native_7.6.bb
packages/libpcre/libpcre_4.4.bb
packages/libpcre/libpcre_7.6.bb
packages/libpcre/files/pcre-cross.patch
Diffs:

#
# mt diff -r8543a70133345bb92a03e0e62346e35801010489 -r74a86bc83da99adde4ae4d45ad98dcb682d01f22
#
#
#
# delete "packages/libpcre/files/native-rpath-link.patch"
# 
# rename "packages/libpcre/libpcre-native_4.4.bb"
#     to "packages/libpcre/libpcre-native_7.6.bb"
# 
# rename "packages/libpcre/libpcre_4.4.bb"
#     to "packages/libpcre/libpcre_7.6.bb"
# 
# add_file "packages/libpcre/files/pcre-cross.patch"
#  content [b054d55f39a11ecec6235479cc833c5613f4c103]
# 
# patch "packages/libpcre/libpcre-native_7.6.bb"
#  from [ed1f69edae4a3f980279b01f41cff189d07002d0]
#    to [c4ac31ba20193fddeaddb6cb93290479579b9ad2]
# 
# patch "packages/libpcre/libpcre_7.6.bb"
#  from [984032d4632ad803f48b7e387b39cad745c99917]
#    to [603909433dfd8e32909049de4d3e77a2552f140d]
#
============================================================
--- packages/libpcre/files/pcre-cross.patch	b054d55f39a11ecec6235479cc833c5613f4c103
+++ packages/libpcre/files/pcre-cross.patch	b054d55f39a11ecec6235479cc833c5613f4c103
@@ -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) $@
============================================================
--- packages/libpcre/libpcre-native_4.4.bb	ed1f69edae4a3f980279b01f41cff189d07002d0
+++ packages/libpcre/libpcre-native_7.6.bb	c4ac31ba20193fddeaddb6cb93290479579b9ad2
@@ -7,8 +7,6 @@ PROVIDES = ""
 # 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
============================================================
--- packages/libpcre/libpcre_4.4.bb	984032d4632ad803f48b7e387b39cad745c99917
+++ packages/libpcre/libpcre_7.6.bb	603909433dfd8e32909049de4d3e77a2552f140d
@@ -5,9 +5,10 @@ SECTION = "devel"
 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 @@ CFLAGS_append = " -D_REENTRANT"
 
 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 () {