From dd06027302a8e03d4c6703720b35a1b6099cddf0 Mon Sep 17 00:00:00 2001
From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
Date: Mon, 23 Feb 2009 00:21:29 +0100
Subject: libtool[native|cross]: 2.2.4 is the new default

---
 packages/libtool/libtool-cross_2.2.4.bb  | 12 +++++++-----
 packages/libtool/libtool-native_2.2.4.bb |  8 ++++----
 packages/libtool/libtool.inc             |  1 +
 packages/libtool/libtool_2.2.4.bb        |  5 +----
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/libtool')

diff --git a/packages/libtool/libtool-cross_2.2.4.bb b/packages/libtool/libtool-cross_2.2.4.bb
index 9b3c6d78ea..fab8aa4d42 100644
--- a/packages/libtool/libtool-cross_2.2.4.bb
+++ b/packages/libtool/libtool-cross_2.2.4.bb
@@ -1,11 +1,11 @@
 require libtool.inc
 require libtool_${PV}.bb
-
 PR = "r23"
-PACKAGES = ""
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://cross_compile.patch;patch=1 \
-                   file://prefix.patch;patch=1"
+
+SRC_URI += "\
+  file://cross_compile.patch;patch=1 \
+  file://prefix.patch;patch=1 \
+"
 
 DEPENDS += "libtool-native"
 
@@ -43,3 +43,5 @@ do_stage () {
 do_install () {
 	:
 }
+
+PACKAGES = ""
diff --git a/packages/libtool/libtool-native_2.2.4.bb b/packages/libtool/libtool-native_2.2.4.bb
index a4f76c69dc..bfef6a6c96 100644
--- a/packages/libtool/libtool-native_2.2.4.bb
+++ b/packages/libtool/libtool-native_2.2.4.bb
@@ -1,11 +1,11 @@
 require libtool.inc
 require libtool_${PV}.bb
-
 PR = "r20"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
-SRC_URI_append = " file://cross_compile.patch;patch=1 \
-                   file://prefix.patch;patch=1"
 
+SRC_URI += "\
+  file://cross_compile.patch;patch=1 \
+  file://prefix.patch;patch=1 \
+"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit native
diff --git a/packages/libtool/libtool.inc b/packages/libtool/libtool.inc
index db86d15ba4..197612910a 100644
--- a/packages/libtool/libtool.inc
+++ b/packages/libtool/libtool.inc
@@ -6,3 +6,4 @@ HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html"
 LICENSE = "GPL"
 SECTION = "devel"
 
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"
diff --git a/packages/libtool/libtool_2.2.4.bb b/packages/libtool/libtool_2.2.4.bb
index c8380d161c..f4b1ab824f 100644
--- a/packages/libtool/libtool_2.2.4.bb
+++ b/packages/libtool/libtool_2.2.4.bb
@@ -1,8 +1,5 @@
 require libtool.inc
-
-PR = "r14"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r15"
 
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz"
 S = "${WORKDIR}/libtool-${PV}"
-- 
cgit v1.2.3