summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-06-01 14:49:54 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-06-02 11:57:49 +0100
commit648290d5bf4d6ff50d3643bb7ad902dfc23aa702 (patch)
treebd01a20f919c3ea0d924a4ba5334fba2cc7d4534 /meta
parent420b1d848842cdf687b14e95f2c7f737d2745033 (diff)
downloadopenembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.tar.gz
openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.tar.bz2
openembedded-core-648290d5bf4d6ff50d3643bb7ad902dfc23aa702.zip
libtool: Make sure ltmain.sh is always regenerated. We can't just remove it since it has to be present to run configure
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/libtool/libtool-2.2.6/trailingslash.patch18
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.6.bb6
-rw-r--r--meta/packages/libtool/libtool-native_2.2.6.bb2
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.6.bb2
-rw-r--r--meta/packages/libtool/libtool_2.2.6.bb8
5 files changed, 13 insertions, 23 deletions
diff --git a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
index 71bb4c1b8f..b1956a6134 100644
--- a/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
+++ b/meta/packages/libtool/libtool-2.2.6/trailingslash.patch
@@ -4,24 +4,6 @@ This is because libdir has a trailing slash which breaks the comparision.
RP 2/1/10
-Index: libtool-2.2.6/libltdl/config/ltmain.sh
-===================================================================
---- libtool-2.2.6.orig/libltdl/config/ltmain.sh 2008-09-07 18:56:33.000000000 +0100
-+++ libtool-2.2.6/libltdl/config/ltmain.sh 2010-02-02 15:36:17.083936911 +0000
-@@ -2009,8 +2009,12 @@
- dir="$dir$objdir"
-
- if test -n "$relink_command"; then
-+ # Strip any trailing slash from the destination.
-+ func_stripname '' '/' "$libdir"
-+ destlibdir=$func_stripname_result
-+
- # Determine the prefix the user has applied to our future dir.
-- inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-+ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$destlibdir\$%%"`
-
- # Don't allow the user to place us outside of our expected
- # location b/c this prevents finding dependent libraries that
Index: libtool-2.2.6/libltdl/config/ltmain.m4sh
===================================================================
--- libtool-2.2.6.orig/libltdl/config/ltmain.m4sh 2010-02-02 16:06:29.793905001 +0000
diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb
index 6710efa0ea..be5261f6bb 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 = "r29"
+PR = "r30"
PACKAGES = ""
SRC_URI_append = " file://cross_compile.patch;patch=1 \
file://prefix.patch;patch=1"
@@ -22,7 +22,9 @@ do_configure_prepend () {
}
do_compile () {
- :
+ # Sometimes this file doesn't get rebuilt, force the issue
+ rm -f ${S}/libltdl/config/ltmain.sh
+ make libltdl/config/ltmain.sh
}
do_install () {
diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb
index ec8f651889..c5827ffb48 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 = "r22"
+PR = "r23"
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 cad256cfe4..77acbd5854 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 = "r3"
+PR = "r4"
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 00e5cf8e29..e5deac7c40 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 = "r20"
+PR = "r21"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}a.tar.gz \
file://trailingslash.patch;patch=1 \
@@ -16,6 +16,12 @@ inherit autotools
EXTRA_AUTORECONF = "--exclude=libtoolize"
+do_compile_prepend () {
+ # Sometimes this file doesn't get rebuilt, force the issue
+ rm -f ${S}/libltdl/config/ltmain.sh
+ make libltdl/config/ltmain.sh
+}
+
#
# We want the results of libtool-cross preserved - don't stage anything ourselves.
#