From bcb1eb89bfc4e6c3b8142b4bdb1aeba730c0b04e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Mon, 23 May 2011 15:41:57 -0700 Subject: libpcre: upgrade from 8.10 to 8.12 (From OE-Core rev: 8a790577c6cce584a29d2ecfdf82300f595cdbba) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/libpcre_8.10.bb | 58 ---------------------------- meta/recipes-support/libpcre/libpcre_8.12.bb | 58 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 meta/recipes-support/libpcre/libpcre_8.10.bb create mode 100644 meta/recipes-support/libpcre/libpcre_8.12.bb (limited to 'meta/recipes-support/libpcre') diff --git a/meta/recipes-support/libpcre/libpcre_8.10.bb b/meta/recipes-support/libpcre/libpcre_8.10.bb deleted file mode 100644 index 2e174933ca..0000000000 --- a/meta/recipes-support/libpcre/libpcre_8.10.bb +++ /dev/null @@ -1,58 +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 = "r6" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ - file://pcre-cross.patch;patch=1 \ - file://fix-pcre-name-collision.patch" - -SRC_URI[md5sum] = "780867a700e9d4e4b9cb47aa5453e4b2" -SRC_URI[sha256sum] = "7ac4e016f6bad8c7d990e6de9bce58c04ff5dd8838be0c5ada0afad1d6a07480" -S = "${WORKDIR}/pcre-${PV}" - -PROVIDES = "pcre" - -inherit autotools binconfig - -PARALLEL_MAKE = "" - -CFLAGS_append = " -D_REENTRANT" -CXXFLAGS_powerpc += "-lstdc++" -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 - if [ -e ${S}/${TARGET_SYS}-libtool ] ; then - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool - else - ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool - fi - - # 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" -} - -python populate_packages_prepend () { - pcre_libdir = bb.data.expand('${libdir}', d) - pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') - do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') - do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True) -} - -FILES_${PN} = "${libdir}/libpcre.so.*" -FILES_${PN}-dev += "${bindir}/*" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/libpcre/libpcre_8.12.bb b/meta/recipes-support/libpcre/libpcre_8.12.bb new file mode 100644 index 0000000000..0301ddb30b --- /dev/null +++ b/meta/recipes-support/libpcre/libpcre_8.12.bb @@ -0,0 +1,58 @@ +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 = "r0" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENCE;md5=77f9b14fe707d0376d89bc162e6c54ff" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ + file://pcre-cross.patch;patch=1 \ + file://fix-pcre-name-collision.patch" + +SRC_URI[md5sum] = "f14a9fef3c92f3fc6c5ac92d7a2c7eb3" +SRC_URI[sha256sum] = "c63070d461edc451ec9457f2324e152a531e907d5c5d2d8f8121e725acd1aeec" +S = "${WORKDIR}/pcre-${PV}" + +PROVIDES = "pcre" + +inherit autotools binconfig + +PARALLEL_MAKE = "" + +CFLAGS_append = " -D_REENTRANT" +CXXFLAGS_powerpc += "-lstdc++" +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 + if [ -e ${S}/${TARGET_SYS}-libtool ] ; then + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool + else + ln -sf ${S}/libtool ${S}/${TARGET_SYS}-libtool + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${TARGET_SYS}-libtool + fi + + # 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" +} + +python populate_packages_prepend () { + pcre_libdir = bb.data.expand('${libdir}', d) + pcre_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, pcre_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, pcre_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'libpcre %s development package', extra_depends='${PN}-dev') + do_split_packages(d, pcre_libdir, '^lib(.*)\.so\.*', 'lib%s', 'libpcre %s library', extra_depends='', allow_links=True) +} + +FILES_${PN} = "${libdir}/libpcre.so.*" +FILES_${PN}-dev += "${bindir}/*" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf