[oe-commits] org.oe.dev libpcre: fix builds with libtool 2.2.4

[koen commit]

libpcre: fix builds with libtool 2.2.4

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 30d4a23811781ddb71ec8d55da9459f44c9ac2d5
ViewMTN: http://monotone.openembedded.org/revision/info/30d4a23811781ddb71ec8d55da9459f44c9ac2d5
Files:
1
packages/libpcre/libpcre_7.6.bb
Diffs:

#
# mt diff -r282fa2df275e34261f4758bfac047984af8c382b -r30d4a23811781ddb71ec8d55da9459f44c9ac2d5
#
#
#
# patch "packages/libpcre/libpcre_7.6.bb"
#  from [c46013011971789edcc9c8fbdc494ef7dde53070]
#    to [634984fadf847a04361ed5aadf7338da3d63f9b0]
#
============================================================
--- packages/libpcre/libpcre_7.6.bb	c46013011971789edcc9c8fbdc494ef7dde53070
+++ packages/libpcre/libpcre_7.6.bb	634984fadf847a04361ed5aadf7338da3d63f9b0
@@ -5,7 +5,7 @@ SECTION = "devel"
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r2"
+PR = "r3"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch;patch=1"
@@ -25,7 +25,12 @@ do_compile () {
 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
+	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