summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-19 15:43:40 +0000
committerSaul Wold <sgw@linux.intel.com>2011-01-21 01:36:14 -0800
commit66988ee0a236165e940fe9c6609f37f8a3491d9f (patch)
treef0756d5dbf1efba88b022ca95df6f62f50ae9e16
parent4a62f3fc5ff022059c824c046841adda64a51f38 (diff)
downloadpoky-66988ee0a236165e940fe9c6609f37f8a3491d9f.tar.gz
libtool: Move common version specific data to a common include file
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.inc11
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.bb4
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.bb2
-rw-r--r--meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb2
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.bb19
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 @@
1require libtool.inc
2DEPENDS = "libtool-native"
3
4PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
5FILES_${PN} += "${datadir}/aclocal*"
6FILES_libltdl = "${libdir}/libltdl.so.*"
7FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
8FILES_libltdl-dbg = "${libdir}/.debug/"
9
10SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
11SRC_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 @@
1require libtool_${PV}.bb 1require libtool-${PV}.inc
2 2
3PR = "r1" 3PR = "r1"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI_append = " file://cross_compile.patch \ 5SRC_URI_append = " file://cross_compile.patch \
6 file://prefix.patch " 6 file://prefix.patch "
7 7
8DEPENDS += "libtool-native"
9
10do_configure_prepend () { 8do_configure_prepend () {
11 # Remove any existing libtool m4 since old stale versions would break 9 # Remove any existing libtool m4 since old stale versions would break
12 # any upgrade 10 # 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 @@
1require libtool_${PV}.bb 1require libtool-${PV}.inc
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
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 @@
1require libtool_${PV}.bb 1require libtool-${PV}.inc
2 2
3PR = "r1" 3PR = "r1"
4SRC_URI_append = " file://cross_compile.patch \ 4SRC_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 @@
1require libtool.inc 1require libtool-${PV}.inc
2DEPENDS = "libtool-native"
3 2
4PR = "r1" 3PR = "r1"
5 4
6PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
7FILES_${PN} += "${datadir}/aclocal*"
8FILES_libltdl = "${libdir}/libltdl.so.*"
9FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h ${includedir}/libltdl/* ${datadir}/aclocal/ltdl.m4 ${datadir}/libtool/libltdl/*"
10FILES_libltdl-dbg = "${libdir}/.debug/"
11
12# 5#
13# We want the results of libtool-cross preserved - don't stage anything ourselves. 6# We want the results of libtool-cross preserved - don't stage anything ourselves.
14# 7#
15SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess" 8SYSROOT_PREPROCESS_FUNCS += "libtool_sysroot_preprocess"
16 9
17libtool_sysroot_preprocess () { 10libtool_sysroot_preprocess () {
18 if [ "${PN}" == "libtool" ]; then 11 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/*
19 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${bindir}/* 12 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/*
20 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/aclocal/* 13 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/*
21 rm -rf ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${datadir}/libtool/config/*
22 fi
23} 14}
24 15
25SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
26SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"