libtool: Make sure ltmain.sh is always regenerated. We can't just remove it since it has to be present to run configure

This commit is contained in:
Richard Purdie 2010-06-01 14:49:54 +01:00
parent 420b1d8488
commit 648290d5bf
5 changed files with 13 additions and 23 deletions

View File

@ -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

View File

@ -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 () {

View File

@ -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"

View File

@ -1,6 +1,6 @@
require libtool_${PV}.bb
PR = "r3"
PR = "r4"
SRC_URI_append = " file://cross_compile.patch;patch=1"
inherit nativesdk

View File

@ -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.
#