[oe-commits] org.oe.dev libpcre: fixes resulting from renaming pcre->libpcre
MartinDietze commit
openembedded-commits at lists.openembedded.org
Mon Sep 11 15:11:36 UTC 2006
libpcre: fixes resulting from renaming pcre->libpcre
* the recipes in libpcre now contain the code from the removed pcre packages (sorry for the mess)
* nylon-feed now DEPENDs on libpcre instead of pcre
Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: 4ca57ebd1cdb163e79b0f8d5c2298ae400c6bb46
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ca57ebd1cdb163e79b0f8d5c2298ae400c6bb46
Files:
1
packages/libpcre/libpcre-native_4.4.bb
packages/libpcre/libpcre_4.4.bb
packages/meta/nylon-feed.bb
Diffs:
#
# mt diff -r6fcc6d1ddd9e30bb6da0a17d32af6f67bc62cf67 -r4ca57ebd1cdb163e79b0f8d5c2298ae400c6bb46
#
#
#
# patch "packages/libpcre/libpcre-native_4.4.bb"
# from [f3cbc25e5264df9520a4e78e3cc2c9d317e1a870]
# to [5d1843e9a011465fc2be5b25e30258c5029214d8]
#
# patch "packages/libpcre/libpcre_4.4.bb"
# from [727f6c4fed9c15e62c7535adbbb4ea2a26251023]
# to [7fd5d5b604e803f4b60bed6085e27cdfdbcede0a]
#
# patch "packages/meta/nylon-feed.bb"
# from [30f5f4261ff0b67e6c0b2e81d7137fe717339e3c]
# to [2936b19008b41d749c17ae7096606f0e2130218e]
#
============================================================
--- packages/libpcre/libpcre-native_4.4.bb f3cbc25e5264df9520a4e78e3cc2c9d317e1a870
+++ packages/libpcre/libpcre-native_4.4.bb 5d1843e9a011465fc2be5b25e30258c5029214d8
@@ -1,4 +1,4 @@ SECTION = "unknown"
SECTION = "unknown"
-include libpcre_${PV}.bb
+require libpcre_${PV}.bb
inherit native
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpcre-${PV}"
============================================================
--- packages/libpcre/libpcre_4.4.bb 727f6c4fed9c15e62c7535adbbb4ea2a26251023
+++ packages/libpcre/libpcre_4.4.bb 7fd5d5b604e803f4b60bed6085e27cdfdbcede0a
@@ -5,41 +5,37 @@ SECTION = "devel"
themselves still follow Perl syntax and semantics. The header file for \
the POSIX-style functions is called pcreposix.h."
SECTION = "devel"
-PR = "r1"
-
+PR = "r6"
+LICENSE = "BSD"
SRC_URI = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PV}.tar.bz2"
S = "${WORKDIR}/pcre-${PV}"
-PARALLEL_MAKE = ""
-
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 () {
- ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c dftables.c
- ${BUILD_CC} dftables.o -o dftables
- oe_runmake
+ # 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 () {
- # Force all -L(dir) output to be prepended with the staging libdir to stop libtool
- # from trying to link to host libraries.
- sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
-
- 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}/
-
- # pcreposix linked originally to the libpcre in it's working directory. That messed
- # the .la file up. I fix this manually here:
- sed -i 's:${S}:${STAGING_LIBDIR}:' ${STAGING_LIBDIR}/libpcreposix.la
+ 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}/
}
-
FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN}-dev += "${bindir}/*"
-FILES_${PN}-dev += "${bindir}"
============================================================
--- packages/meta/nylon-feed.bb 30f5f4261ff0b67e6c0b2e81d7137fe717339e3c
+++ packages/meta/nylon-feed.bb 2936b19008b41d749c17ae7096606f0e2130218e
@@ -9,7 +9,6 @@ DEPENDS = "${NYLON_FEED} \
glib-2.0 \
glibc \
gmp \
- hotplug \
iproute2 \
libcgicc \
libedit \
More information about the Openembedded-commits
mailing list