[oe-commits] org.oe.dev pcre: attempt to repair the damage introduced

[koen commit]

pcre: attempt to repair the damage introduced

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a
Files:
1
packages/libpcre/libpcre_4.4.bb
Diffs:

#
# mt diff -rabdf62cfde72bff2a32973068f3d6880118a80e4 -rc6bcfdb59d3237f59868cab3ac70dcc8c36efa5a
#
# 
# 
# patch "packages/libpcre/libpcre_4.4.bb"
#  from [b958bf7ab27f34376043f80a149c3984bb8f83a8]
#    to [727f6c4fed9c15e62c7535adbbb4ea2a26251023]
# 
============================================================
--- packages/libpcre/libpcre_4.4.bb	b958bf7ab27f34376043f80a149c3984bb8f83a8
+++ packages/libpcre/libpcre_4.4.bb	727f6c4fed9c15e62c7535adbbb4ea2a26251023
@@ -10,12 +10,15 @@ S = "${WORKDIR}/pcre-${PV}"
 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
 
 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
@@ -23,11 +26,20 @@ do_stage () {
 }
 
 do_stage () {
-	oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
-	oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
-	install -m 0644 pcre.h ${STAGING_INCDIR}/
-	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
+        # 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
 }
 
+
 FILES_${PN} = "${libdir}/lib*.so*"
 FILES_${PN}-dev += "${bindir}"