diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb index 6fefd02bb5..2005e98339 100644 --- a/meta/packages/libtool/libtool-cross_2.2.6.bb +++ b/meta/packages/libtool/libtool-cross_2.2.6.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "r25" +PR = "r26" PACKAGES = "" SRC_URI_append = " file://cross_compile.patch;patch=1 \ file://prefix.patch;patch=1" diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb index 5d813b5211..03db06c58f 100644 --- a/meta/packages/libtool/libtool-native_2.2.6.bb +++ b/meta/packages/libtool/libtool-native_2.2.6.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "r19" +PR = "r20" SRC_URI_append = " file://cross_compile.patch;patch=1 \ file://prefix.patch;patch=1" diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb index 537647cbac..96978f4ccb 100644 --- a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb +++ b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "r0" +PR = "r1" SRC_URI_append = " file://cross_compile.patch;patch=1" inherit nativesdk diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb index f3228c28fe..7f5f36ce19 100644 --- a/meta/packages/libtool/libtool_2.2.6.bb +++ b/meta/packages/libtool/libtool_2.2.6.bb @@ -1,6 +1,6 @@ require libtool.inc -PR = "r16" +PR = "r17" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \ file://dolt.m4" @@ -15,15 +15,15 @@ inherit autotools_stage EXTRA_AUTORECONF = "--exclude=libtoolize" - - # # We want the results of libtool-cross preserved - don't stage anything ourselves. # SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" libtool_sysroot_preprocess () { - rm -rf ${SYSROOT_DESTDIR}/${bindir}/* - rm -rf ${SYSROOT_DESTDIR}/${datadir}/aclocal/* - rm -rf ${SYSROOT_DESTDIR}/${datadir}/libtool/config/* + if [ "${PN}" == "libtool" ]; then + rm -rf ${SYSROOT_DESTDIR}/${bindir}/* + rm -rf ${SYSROOT_DESTDIR}/${datadir}/aclocal/* + rm -rf ${SYSROOT_DESTDIR}/${datadir}/libtool/config/* + fi }