diff options
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-2.4.inc | 11 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-native_2.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/libtool/libtool_2.4.bb | 19 |
5 files changed, 18 insertions, 20 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc new file mode 100644 index 0000000000..53ee882ee5 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-2.4.inc @@ -0,0 +1,11 @@ +require libtool.inc +DEPENDS = "libtool-native" + +PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" +FILES_${PN} += "${datadir}/aclocal*" +FILES_libltdl = "${libdir}/libltdl.so.*" +FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" +FILES_libltdl-dbg = "${libdir}/.debug/" + +SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021" +SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb index 23135f7edb..3193ba28ea 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb @@ -1,12 +1,10 @@ -require libtool_${PV}.bb +require libtool-${PV}.inc PR = "r1" PACKAGES = "" SRC_URI_append = " file://cross_compile.patch \ file://prefix.patch " -DEPENDS += "libtool-native" - do_configure_prepend () { # Remove any existing libtool m4 since old stale versions would break # any upgrade diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb index 0c6f54a156..20981a5ba5 100644 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb @@ -1,4 +1,4 @@ -require libtool_${PV}.bb +require libtool-${PV}.inc DEPENDS = "" diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb index e972d9ef3d..ac95b43fd4 100644 --- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb @@ -1,4 +1,4 @@ -require libtool_${PV}.bb +require libtool-${PV}.inc PR = "r1" SRC_URI_append = " file://cross_compile.patch \ diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.bb index 1e5ce92130..ee24444a81 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.bb +++ b/meta/recipes-devtools/libtool/libtool_2.4.bb @@ -1,26 +1,15 @@ -require libtool.inc -DEPENDS = "libtool-native" +require libtool-${PV}.inc PR = "r1" -PACKAGES =+ "libltdl libltdl-dev libltdl-dbg" -FILES_${PN} += "${datadir}/aclocal*" -FILES_libltdl = "${libdir}/libltdl.so.*" -FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/* ${datadir}/aclocal/ltdl.m4 ${datadir}/libtool/libltdl/*" -FILES_libltdl-dbg = "${libdir}/.debug/" - # # We want the results of libtool-cross preserved - don't stage anything ourselves. # SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" libtool_sysroot_preprocess () { - if [ "${PN}" == "libtool" ]; then - rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/* - rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/* - rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/* - fi + rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/* + rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/* + rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/* } -SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021" -SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" |