11 files changed, 25 insertions, 36 deletions
diff --git a/packages/libtool/libtool-cross_1.5.10.bb b/packages/libtool/libtool-cross_1.5.10.bb
index 5f15c56a97..0d0b90ac81 100644
--- a/packages/libtool/libtool-cross_1.5.10.bb
+++ b/packages/libtool/libtool-cross_1.5.10.bb
@@ -1,7 +1,7 @@
-SECTION = "devel"
+require libtool.inc
 require libtool_${PV}.bb
 
-PR = "r9"
+PR = "r10"
 PACKAGES = ""
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
 SRC_URI_append = " file://libdir-la.patch;patch=1 \
@@ -18,7 +18,7 @@ prefix = "${STAGING_DIR_NATIVE}${layout_prefix}"
 exec_prefix = "${STAGING_DIR_NATIVE}${layout_exec_prefix}"
 bindir = "${STAGING_BINDIR_NATIVE}"
 
-do_compile () {
+do_configure_prepend () {
 	rm -f ltmain.shT
 	date=`/bin/sh ./mkstamp < ./ChangeLog` && \
         sed -e 's/@''PACKAGE@/libtool/' -e 's/@''VERSION@/1.5.10/' \
@@ -28,6 +28,10 @@ do_compile () {
 	cp ltmain.sh ./libltdl/
 }
 
+do_compile () {
+	:
+}
+
 do_stage () {
         install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
         install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
diff --git a/packages/libtool/libtool-cross_1.5.22.bb b/packages/libtool/libtool-cross_1.5.22.bb
index c91647b559..c44b0512ee 100644
--- a/packages/libtool/libtool-cross_1.5.22.bb
+++ b/packages/libtool/libtool-cross_1.5.22.bb
@@ -1,6 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 
-SECTION = "devel"
+require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r0"
diff --git a/packages/libtool/libtool-cross_1.5.24.bb b/packages/libtool/libtool-cross_1.5.24.bb
index e60db4b808..cf6cc18ef6 100644
--- a/packages/libtool/libtool-cross_1.5.24.bb
+++ b/packages/libtool/libtool-cross_1.5.24.bb
@@ -1,4 +1,4 @@
-SECTION = "devel"
+require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r0"
diff --git a/packages/libtool/libtool-native_1.5.10.bb b/packages/libtool/libtool-native_1.5.10.bb
index e21a20b85d..ec3dd604cd 100644
--- a/packages/libtool/libtool-native_1.5.10.bb
+++ b/packages/libtool/libtool-native_1.5.10.bb
@@ -1,4 +1,4 @@
-SECTION = "devel"
+require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r9"
diff --git a/packages/libtool/libtool-native_1.5.22.bb b/packages/libtool/libtool-native_1.5.22.bb
index dec4bf1e14..16db0bb65b 100644
--- a/packages/libtool/libtool-native_1.5.22.bb
+++ b/packages/libtool/libtool-native_1.5.22.bb
@@ -1,6 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 
-SECTION = "devel"
+require libtool.inc
 require libtool_${PV}.bb
 
 PR = "r0"
diff --git a/packages/libtool/libtool-native_1.5.24.bb b/packages/libtool/libtool-native_1.5.24.bb
index 3587dd8034..1b0cb90a1e 100644
--- a/packages/libtool/libtool-native_1.5.24.bb
+++ b/packages/libtool/libtool-native_1.5.24.bb
@@ -1,6 +1,7 @@
 SECTION = "devel"
+
+require libtool.inc
 require libtool_${PV}.bb
-DEFAULT_PREFERENCE = "-1"
 
 PR = "r0"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
diff --git a/packages/libtool/libtool.inc b/packages/libtool/libtool.inc
new file mode 100644
index 0000000000..db86d15ba4
--- /dev/null
+++ b/packages/libtool/libtool.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Generic library support script \
+This is GNU libtool, a generic library support script.  Libtool hides \
+the complexity of generating special library types (such as shared \
+libraries) behind a consistent interface."
+HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
+LICENSE = "GPL"
+SECTION = "devel"
+
diff --git a/packages/libtool/libtool_1.5.10.bb b/packages/libtool/libtool_1.5.10.bb
index 3a9ff7ef59..428a06a0e7 100644
--- a/packages/libtool/libtool_1.5.10.bb
+++ b/packages/libtool/libtool_1.5.10.bb
@@ -1,10 +1,4 @@
-DESCRIPTION = "Generic library support script \
-This is GNU libtool, a generic library support script.  Libtool hides \
-the complexity of generating special library types (such as shared \
-libraries) behind a consistent interface."
-HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
-LICENSE = "GPL"
-SECTION = "devel"
+require libtool.inc
 PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
diff --git a/packages/libtool/libtool_1.5.22.bb b/packages/libtool/libtool_1.5.22.bb
index 66182cb57e..4bed7842b4 100644
--- a/packages/libtool/libtool_1.5.22.bb
+++ b/packages/libtool/libtool_1.5.22.bb
@@ -1,12 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 
-DESCRIPTION = "Generic library support script \
-This is GNU libtool, a generic library support script.  Libtool hides \
-the complexity of generating special library types (such as shared \
-libraries) behind a consistent interface."
-HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
-LICENSE = "GPL"
-SECTION = "devel"
+require libtool.inc
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
diff --git a/packages/libtool/libtool_1.5.24.bb b/packages/libtool/libtool_1.5.24.bb
index f40613f3ee..7bdad1bed4 100644
--- a/packages/libtool/libtool_1.5.24.bb
+++ b/packages/libtool/libtool_1.5.24.bb
@@ -1,12 +1,6 @@
 DEFAULT_PREFERENCE = "-1"
 
-DESCRIPTION = "Generic library support script \
-This is GNU libtool, a generic library support script.  Libtool hides \
-the complexity of generating special library types (such as shared \
-libraries) behind a consistent interface."
-HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
-LICENSE = "GPL"
-SECTION = "devel"
+require libtool.inc
 PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
diff --git a/packages/libtool/libtool_1.5.6.bb b/packages/libtool/libtool_1.5.6.bb
index 7c02c4ba97..7fd9b81a3d 100644
--- a/packages/libtool/libtool_1.5.6.bb
+++ b/packages/libtool/libtool_1.5.6.bb
@@ -1,12 +1,6 @@
 # Exists for compatibility with certain distributions (e.g. Maemo).
 
-DESCRIPTION = "Generic library support script \
-This is GNU libtool, a generic library support script.  Libtool hides \
-the complexity of generating special library types (such as shared \
-libraries) behind a consistent interface."
-HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
-LICENSE = "GPL"
-SECTION = "devel"
+require libtool.inc
 PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"