From 94f7efd4bc93610e880fbffad23b94462d2fc449 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sun, 6 Apr 2008 23:36:07 +0000 Subject: 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) --- packages/libpcre/files/native-rpath-link.patch | 19 ----------- packages/libpcre/files/pcre-cross.patch | 25 ++++++++++++++ packages/libpcre/libpcre-native_4.4.bb | 19 ----------- packages/libpcre/libpcre-native_7.6.bb | 17 ++++++++++ packages/libpcre/libpcre_4.4.bb | 45 ------------------------- packages/libpcre/libpcre_7.6.bb | 46 ++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 83 deletions(-) delete mode 100644 packages/libpcre/files/native-rpath-link.patch create mode 100644 packages/libpcre/files/pcre-cross.patch delete mode 100644 packages/libpcre/libpcre-native_4.4.bb create mode 100644 packages/libpcre/libpcre-native_7.6.bb delete mode 100644 packages/libpcre/libpcre_4.4.bb create mode 100644 packages/libpcre/libpcre_7.6.bb 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_4.4.bb deleted file mode 100644 index 1bbfde7f0a..0000000000 --- a/packages/libpcre/libpcre-native_4.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "unknown" -require libpcre_${PV}.bb -inherit native -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" - -# NOTE: multiple providers are available (libpcre, libpcre-native); -# 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 - # 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}" -} - diff --git a/packages/libpcre/libpcre-native_7.6.bb b/packages/libpcre/libpcre-native_7.6.bb new file mode 100644 index 0000000000..20a4bdb978 --- /dev/null +++ b/packages/libpcre/libpcre-native_7.6.bb @@ -0,0 +1,17 @@ +SECTION = "unknown" +require libpcre_${PV}.bb +inherit native +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}" + +# NOTE: multiple providers are available (libpcre, libpcre-native); +# NOTE: consider defining PREFERRED_PROVIDER_pcre +PROVIDES = "" + +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 + # 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}" +} + diff --git a/packages/libpcre/libpcre_4.4.bb b/packages/libpcre/libpcre_4.4.bb deleted file mode 100644 index 517256a0ff..0000000000 --- a/packages/libpcre/libpcre_4.4.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "Perl-compatible regular expression library. PCRE has its own native \ -API, but a set of 'wrapper' functions that are based on the POSIX API \ -are also supplied in the library libpcreposix. Note that this just \ -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" -LICENSE = "BSD" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2" -S = "${WORKDIR}/pcre-${PV}" - -PROVIDES = "pcre" - -inherit autotools binconfig - -PARALLEL_MAKE = "" - -LEAD_SONAME = "libpcre.so" -CFLAGS_append = " -D_REENTRANT" -EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10000000" - -do_compile () { - # stop libtool from trying to link with host libraries - fix from #33 - # this resolve build problem on amd64 - #1015 - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool - - # 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 - # 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}" -} - -do_stage () { - oe_libinstall -a -so libpcre ${STAGING_LIBDIR} - oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} - install -m 0644 pcre.h ${STAGING_INCDIR}/ - install -m 0644 pcreposix.h ${STAGING_INCDIR}/ - install -d ${STAGING_BINDIR_NATIVE} - install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ -} - -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev += "${bindir}/*" diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb new file mode 100644 index 0000000000..3171e10e68 --- /dev/null +++ b/packages/libpcre/libpcre_7.6.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Perl-compatible regular expression library. PCRE has its own native \ +API, but a set of 'wrapper' functions that are based on the POSIX API \ +are also supplied in the library libpcreposix. Note that this just \ +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 = "r1" +LICENSE = "BSD" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ + file://pcre-cross.patch;patch=1" +S = "${WORKDIR}/pcre-${PV}" + +PROVIDES = "pcre" + +inherit autotools binconfig + +PARALLEL_MAKE = "" + +LEAD_SONAME = "libpcre.so" +CFLAGS_append = " -D_REENTRANT" +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 + # this resolve build problem on amd64 - #1015 + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool + + # 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 + # 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} -L${S}/lib" +} + +do_stage () { + oe_libinstall -a -so libpcre ${STAGING_LIBDIR} + oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR} + install -m 0644 pcre.h ${STAGING_INCDIR}/ + install -m 0644 pcreposix.h ${STAGING_INCDIR}/ + install -d ${STAGING_BINDIR_NATIVE} + install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/ +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/*" -- cgit v1.2.3