diff options
author | Koen Kooi <koen@openembedded.org> | 2008-06-15 12:45:08 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2008-06-15 12:45:08 +0000 |
commit | ed57e0e23afc7fbfbedfd1ca2f54a5e29ca4d7bd (patch) | |
tree | 6b6624049e75990f3735f495f4565bbffae08646 | |
parent | 6bc082d7ab93d72420be760a9ada2559f1d1e7ba (diff) |
libpcre: fix builds with libtool 2.2.4
-rw-r--r-- | packages/libpcre/libpcre_7.6.bb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/packages/libpcre/libpcre_7.6.bb b/packages/libpcre/libpcre_7.6.bb index a065b56cfc..eb5af03db0 100644 --- a/packages/libpcre/libpcre_7.6.bb +++ b/packages/libpcre/libpcre_7.6.bb @@ -5,7 +5,7 @@ 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 = "r2" +PR = "r3" LICENSE = "BSD" SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \ file://pcre-cross.patch;patch=1" @@ -25,7 +25,12 @@ EXTRA_OECONF = " --with-link-size=2 --enable-newline-is-lf --with-match-limit=10 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 |