From ccd2a31003315b9627b7a58331de422ce6bc173e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 10 Jan 2012 18:04:39 -0800 Subject: libpcre: upgrade from 8.20 to 8.21 (From OE-Core rev: efd200bc0db4d290445f742798e20914e4db347a) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/recipes-support/libpcre/libpcre_8.20.bb | 55 --------------------------- meta/recipes-support/libpcre/libpcre_8.21.bb | 56 ++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 meta/recipes-support/libpcre/libpcre_8.20.bb create mode 100644 meta/recipes-support/libpcre/libpcre_8.21.bb (limited to 'meta/recipes-support/libpcre') diff --git a/meta/recipes-support/libpcre/libpcre_8.20.bb b/meta/recipes-support/libpcre/libpcre_8.20.bb deleted file mode 100644 index 58c6ecf9a7..0000000000 --- a/meta/recipes-support/libpcre/libpcre_8.20.bb +++ /dev/null @@ -1,55 +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 = "r0" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENCE;md5=2f00d186a775c8002422a5315079d96b" -SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ - file://pcre-cross.patch \ - file://fix-pcre-name-collision.patch" - -SRC_URI[md5sum] = "a1931c70e1273e3450d5036fe273d25c" -SRC_URI[sha256sum] = "e06b0943ce4b0f15324a20020d6086760a75b72f5ad7c23b9b2bfe690ed49acd" -S = "${WORKDIR}/pcre-${PV}" - -PROVIDES = "pcre" -DEPENDS = "bzip2 zlib readline" - -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}/${HOST_SYS}-libtool ] ; then - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool - else - ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool - sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_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) - 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.21.bb b/meta/recipes-support/libpcre/libpcre_8.21.bb new file mode 100644 index 0000000000..4eb65d7e32 --- /dev/null +++ b/meta/recipes-support/libpcre/libpcre_8.21.bb @@ -0,0 +1,56 @@ +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=2f00d186a775c8002422a5315079d96b" +SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ + file://pcre-cross.patch \ + file://fix-pcre-name-collision.patch" + +SRC_URI[md5sum] = "0a7b592bea64b7aa7f4011fc7171a730" +SRC_URI[sha256sum] = "a4b8509d11fc2764fb4e1415b764ad2c214459edc011ce48aeeb6bbe1ac599e3" + +S = "${WORKDIR}/pcre-${PV}" + +PROVIDES = "pcre" +DEPENDS = "bzip2 zlib readline" + +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}/${HOST_SYS}-libtool ] ; then + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_SYS}-libtool + else + ln -sf ${S}/libtool ${S}/${HOST_SYS}-libtool + sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/${HOST_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) + 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