diff options
| -rw-r--r-- | meta/packages/libtool/libtool-1.5.10/nousrlib.patch | 22 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool-1.5.10/tag1.patch | 13 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool-cross_1.5.10.bb | 3 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool-native_1.5.10.bb | 3 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool_1.5.10.bb | 2 |
5 files changed, 3 insertions, 40 deletions
diff --git a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch index 1486337be5..e97b45578d 100644 --- a/meta/packages/libtool/libtool-1.5.10/nousrlib.patch +++ b/meta/packages/libtool/libtool-1.5.10/nousrlib.patch @@ -9,25 +9,3 @@ # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case "$libdir" in ---- libtool-1.5.10.orig/libltdl/ltmain.sh -+++ libtool-1.5.10/libltdl/ltmain.sh -@@ -2630,8 +2630,6 @@ - add="$libdir/$linklib" - fi - else -- # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in ---- libtool-1.5.10.orig/ltmain.sh -+++ libtool-1.5.10/ltmain.sh -@@ -2630,8 +2630,6 @@ - add="$libdir/$linklib" - fi - else -- # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in diff --git a/meta/packages/libtool/libtool-1.5.10/tag1.patch b/meta/packages/libtool/libtool-1.5.10/tag1.patch deleted file mode 100644 index 6fefd6266d..0000000000 --- a/meta/packages/libtool/libtool-1.5.10/tag1.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtool-1.5.10/libltdl/ltmain.sh -=================================================================== ---- libtool-1.5.10.orig/libltdl/ltmain.sh 2004-09-19 13:34:44.000000000 +0100 -+++ libtool-1.5.10/libltdl/ltmain.sh 2006-05-25 15:28:39.000000000 +0100 -@@ -232,7 +232,7 @@ - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb index 0d597b6035..8e6698a7a6 100644 --- a/meta/packages/libtool/libtool-cross_1.5.10.bb +++ b/meta/packages/libtool/libtool-cross_1.5.10.bb @@ -1,13 +1,12 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r7" +PR = "r8" PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ - file://tag1.patch;patch=1 \ file://install-path-check.patch;patch=1 \ file://nousrlib.patch;patch=1" diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb index 0c10fd695e..55bf0d89be 100644 --- a/meta/packages/libtool/libtool-native_1.5.10.bb +++ b/meta/packages/libtool/libtool-native_1.5.10.bb @@ -1,12 +1,11 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r6" +PR = "r8" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ file://tag.patch;patch=1 \ - file://tag1.patch;patch=1 \ file://install-path-check.patch;patch=1 \ file://nousrlib.patch;patch=1" diff --git a/meta/packages/libtool/libtool_1.5.10.bb b/meta/packages/libtool/libtool_1.5.10.bb index 74d9e98107..35cebfa5c2 100644 --- a/meta/packages/libtool/libtool_1.5.10.bb +++ b/meta/packages/libtool/libtool_1.5.10.bb @@ -5,7 +5,7 @@ libraries) behind a consistent interface." HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" LICENSE = "GPL" SECTION = "devel" -PR = "r4" +PR = "r5" SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ file://autotools.patch;patch=1 \ |