summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-11-29 19:30:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 20:40:23 (GMT)
commitd8bee043cbd5c88a0ddca58868f8e4556ef8531c (patch)
treec87a785209b157adb90a735f85e27a9c85ecd17a
parent177b2e337a37a67fe3a8a40d3f0704b30117f9e2 (diff)
downloadpoky-d8bee043cbd5c88a0ddca58868f8e4556ef8531c.tar.gz
libtool: Upgrade from 2.4 -> 2.4.2
Rebased patches to the newer source code and deleted resolve-sysroot.patch since its already applied upstream merged libtool-2.4.2.inc & libtool.inc files replaced PR with ${INC_PR}.0 (From OE-Core rev: aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.2.inc (renamed from meta/recipes-devtools/libtool/libtool.inc)19
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.inc13
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb (renamed from meta/recipes-devtools/libtool/libtool-cross_2.4.bb)2
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.2.bb (renamed from meta/recipes-devtools/libtool/libtool-native_2.4.bb)2
-rw-r--r--meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb (renamed from meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb)2
-rw-r--r--meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch8
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch10
-rw-r--r--meta/recipes-devtools/libtool/libtool/fix-rpath.patch12
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch10
-rw-r--r--meta/recipes-devtools/libtool/libtool/prefix.patch42
-rw-r--r--meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch194
-rw-r--r--meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch42
-rw-r--r--meta/recipes-devtools/libtool/libtool/trailingslash.patch10
-rw-r--r--meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch8
-rw-r--r--meta/recipes-devtools/libtool/libtool_2.4.2.bb (renamed from meta/recipes-devtools/libtool/libtool_2.4.bb)2
15 files changed, 168 insertions, 208 deletions
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index ef9095b..0375ccf 100644
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,15 +8,20 @@ LICENSE = "GPLv2 & LGPLv2.1"
8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06" 9 file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
10 10
11INC_PR = "r0"
12
11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 13SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
12 file://trailingslash.patch \ 14 file://trailingslash.patch \
13 file://prefix-manpage-fix.patch \ 15 file://prefix-manpage-fix.patch \
14 file://rename-with-sysroot.patch \ 16 file://rename-with-sysroot.patch \
15 file://resolve-sysroot.patch \
16 file://use-sysroot-in-libpath.patch \ 17 file://use-sysroot-in-libpath.patch \
17 file://fix-final-rpath.patch \ 18 file://fix-final-rpath.patch \
18 file://avoid_absolute_paths_for_general_utils.patch \ 19 file://avoid_absolute_paths_for_general_utils.patch \
19 file://fix-rpath.patch " 20 file://fix-rpath.patch \
21 "
22
23SRC_URI[md5sum] = "d2f3b7d4627e69e13514a40e72a24d50"
24SRC_URI[sha256sum] = "b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918"
20 25
21do_compile_prepend () { 26do_compile_prepend () {
22 # Sometimes this file doesn't get rebuilt, force the issue 27 # Sometimes this file doesn't get rebuilt, force the issue
@@ -26,3 +31,13 @@ do_compile_prepend () {
26 31
27inherit autotools 32inherit autotools
28EXTRA_AUTORECONF = "--exclude=libtoolize" 33EXTRA_AUTORECONF = "--exclude=libtoolize"
34
35DEPENDS = "libtool-native"
36
37PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
38FILES_${PN} += "${datadir}/aclocal*"
39FILES_libltdl = "${libdir}/libltdl.so.*"
40FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
41FILES_libltdl-dbg = "${libdir}/.debug/"
42
43EXTRA_OECONF = "--with-sysroot"
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
deleted file mode 100644
index e3d17b7..0000000
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ /dev/null
@@ -1,13 +0,0 @@
1require libtool.inc
2DEPENDS = "libtool-native"
3
4PACKAGES =+ "libltdl libltdl-dev libltdl-dbg"
5FILES_${PN} += "${datadir}/aclocal*"
6FILES_libltdl = "${libdir}/libltdl.so.*"
7FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
8FILES_libltdl-dbg = "${libdir}/.debug/"
9
10SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
11SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e"
12
13EXTRA_OECONF = "--with-sysroot" \ No newline at end of file
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
index 5df6908..5003c9b 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -1,6 +1,6 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "r5" 3PR = "${INC_PR}.0"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI += "file://prefix.patch" 5SRC_URI += "file://prefix.patch"
6SRC_URI += "file://fixinstall.patch" 6SRC_URI += "file://fixinstall.patch"
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
index 3d0998e..f12e6a1 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.2.bb
@@ -2,7 +2,7 @@ require libtool-${PV}.inc
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
5PR = "r4" 5PR = "${INC_PR}.0"
6SRC_URI += "file://prefix.patch" 6SRC_URI += "file://prefix.patch"
7 7
8inherit native 8inherit native
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
index bf1928d..03854f2 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.2.bb
@@ -1,6 +1,6 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "r5" 3PR = "${INC_PR}.0"
4SRC_URI += "file://prefix.patch" 4SRC_URI += "file://prefix.patch"
5SRC_URI += "file://fixinstall.patch" 5SRC_URI += "file://fixinstall.patch"
6 6
diff --git a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch
index 6cc88d8..3c751ed 100644
--- a/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch
+++ b/meta/recipes-devtools/libtool/libtool/avoid_absolute_paths_for_general_utils.patch
@@ -12,11 +12,11 @@ Nitin A Kamble <nitin.a.kamble@intel.com>
122011/02/18 122011/02/18
13 13
14 14
15Index: libtool-2.4/libltdl/config/general.m4sh 15Index: libtool-2.4.2/libltdl/config/general.m4sh
16=================================================================== 16===================================================================
17--- libtool-2.4.orig/libltdl/config/general.m4sh 2010-08-31 23:02:45.000000000 -0700 17--- libtool-2.4.2.orig/libltdl/config/general.m4sh
18+++ libtool-2.4/libltdl/config/general.m4sh 2011-02-18 09:59:09.482038240 -0800 18+++ libtool-2.4.2/libltdl/config/general.m4sh
19@@ -45,15 +45,15 @@ 19@@ -45,15 +45,15 @@ progpath="$0"
20 M4SH_VERBATIM([[ 20 M4SH_VERBATIM([[
21 : ${CP="cp -f"} 21 : ${CP="cp -f"}
22 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} 22 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
diff --git a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
index 4c36e4e..5c275ff 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-final-rpath.patch
@@ -7,11 +7,11 @@ This works around the issue until it gets sorted out upstream.
7Fix suggested by Richard Purdie <richard.purdie@intel.com> 7Fix suggested by Richard Purdie <richard.purdie@intel.com>
8Signed-off-by: Scott Garman <scott.a.garman@intel.com> 8Signed-off-by: Scott Garman <scott.a.garman@intel.com>
9 9
10Index: libtool-2.4/libltdl/config/ltmain.m4sh 10Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
11=================================================================== 11===================================================================
12--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-01-13 14:10:14.580025108 +0000 12--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
13+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-01-13 15:10:18.540025113 +0000 13+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
14@@ -7246,9 +7246,11 @@ 14@@ -7268,9 +7268,11 @@ EOF
15 test "$opt_mode" != relink && rpath="$compile_rpath$rpath" 15 test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
16 for libdir in $rpath; do 16 for libdir in $rpath; do
17 if test -n "$hardcode_libdir_flag_spec"; then 17 if test -n "$hardcode_libdir_flag_spec"; then
@@ -25,7 +25,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
25 if test -z "$hardcode_libdirs"; then 25 if test -z "$hardcode_libdirs"; then
26 hardcode_libdirs="$libdir" 26 hardcode_libdirs="$libdir"
27 else 27 else
28@@ -7981,6 +7983,10 @@ 28@@ -7999,6 +8001,10 @@ EOF
29 hardcode_libdirs= 29 hardcode_libdirs=
30 for libdir in $compile_rpath $finalize_rpath; do 30 for libdir in $compile_rpath $finalize_rpath; do
31 if test -n "$hardcode_libdir_flag_spec"; then 31 if test -n "$hardcode_libdir_flag_spec"; then
diff --git a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
index 3cdeaec..d35bac0 100644
--- a/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/fix-rpath.patch
@@ -6,11 +6,11 @@ RP 23/9/2011
6 6
7Upstream-status: Pending 7Upstream-status: Pending
8 8
9Index: libtool-2.4/libltdl/config/ltmain.m4sh 9Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
10=================================================================== 10===================================================================
11--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2011-09-23 08:38:06.365043626 +0100 11--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
12+++ libtool-2.4/libltdl/config/ltmain.m4sh 2011-09-23 09:57:05.235003068 +0100 12+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
13@@ -7264,8 +7264,14 @@ 13@@ -7286,8 +7286,14 @@ EOF
14 esac 14 esac
15 fi 15 fi
16 else 16 else
@@ -27,7 +27,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
27 fi 27 fi
28 elif test -n "$runpath_var"; then 28 elif test -n "$runpath_var"; then
29 case "$perm_rpath " in 29 case "$perm_rpath " in
30@@ -8001,8 +8007,14 @@ 30@@ -8019,8 +8025,14 @@ EOF
31 esac 31 esac
32 fi 32 fi
33 else 33 else
@@ -44,7 +44,7 @@ Index: libtool-2.4/libltdl/config/ltmain.m4sh
44 fi 44 fi
45 elif test -n "$runpath_var"; then 45 elif test -n "$runpath_var"; then
46 case "$perm_rpath " in 46 case "$perm_rpath " in
47@@ -8052,8 +8064,14 @@ 47@@ -8070,8 +8082,14 @@ EOF
48 esac 48 esac
49 fi 49 fi
50 else 50 else
diff --git a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
index f9de383..879778c 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix-manpage-fix.patch
@@ -6,12 +6,12 @@ nstead use the build version of libtool to generate the man pages.
6Date: 2010/07/09 6Date: 2010/07/09
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
8 8
9Index: libtool-2.2.10/Makefile.am 9Index: libtool-2.4.2/Makefile.am
10=================================================================== 10===================================================================
11--- libtool-2.2.10.orig/Makefile.am 11--- libtool-2.4.2.orig/Makefile.am
12+++ libtool-2.2.10/Makefile.am 12+++ libtool-2.4.2/Makefile.am
13@@ -337,7 +337,7 @@ update_mans = \ 13@@ -333,7 +333,7 @@ update_mans = \
14 PATH=.$(PATH_SEPARATOR)$$PATH; export PATH; \ 14 PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
15 $(HELP2MAN) --output=$@ 15 $(HELP2MAN) --output=$@
16 $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh 16 $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
17- $(update_mans) --help-option=--help-all libtool 17- $(update_mans) --help-option=--help-all libtool
diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch
index e6eca1f..5e46e68 100644
--- a/meta/recipes-devtools/libtool/libtool/prefix.patch
+++ b/meta/recipes-devtools/libtool/libtool/prefix.patch
@@ -18,10 +18,10 @@ the simplest fix is just to remove $SHELL.
18Updated: Date: 2011/11/09 18Updated: Date: 2011/11/09
19RP 19RP
20 20
21Index: libtool-2.4/libltdl/m4/libtool.m4 21Index: libtool-2.4.2/libltdl/m4/libtool.m4
22=================================================================== 22===================================================================
23--- libtool-2.4.orig/libltdl/m4/libtool.m4 23--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
24+++ libtool-2.4/libltdl/m4/libtool.m4 24+++ libtool-2.4.2/libltdl/m4/libtool.m4
25@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1]) 25@@ -94,7 +94,8 @@ _LT_SET_OPTIONS([$0], [$1])
26 LIBTOOL_DEPS="$ltmain" 26 LIBTOOL_DEPS="$ltmain"
27 27
@@ -32,7 +32,7 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
32 AC_SUBST(LIBTOOL)dnl 32 AC_SUBST(LIBTOOL)dnl
33 33
34 _LT_SETUP 34 _LT_SETUP
35@@ -204,7 +205,7 @@ aix3*) 35@@ -206,7 +207,7 @@ aix3*)
36 esac 36 esac
37 37
38 # Global variables: 38 # Global variables:
@@ -41,10 +41,10 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
41 can_build_shared=yes 41 can_build_shared=yes
42 42
43 # All known linkers require a `.a' archive for static linking (except MSVC, 43 # All known linkers require a `.a' archive for static linking (except MSVC,
44Index: libtool-2.4/Makefile.am 44Index: libtool-2.4.2/Makefile.am
45=================================================================== 45===================================================================
46--- libtool-2.4.orig/Makefile.am 46--- libtool-2.4.2.orig/Makefile.am
47+++ libtool-2.4/Makefile.am 47+++ libtool-2.4.2/Makefile.am
48@@ -31,7 +31,7 @@ AM_LDFLAGS = 48@@ -31,7 +31,7 @@ AM_LDFLAGS =
49 DIST_SUBDIRS = . 49 DIST_SUBDIRS = .
50 EXTRA_DIST = 50 EXTRA_DIST =
@@ -54,8 +54,17 @@ Index: libtool-2.4/Makefile.am
54 54
55 CLEANFILES = 55 CLEANFILES =
56 MOSTLYCLEANFILES = 56 MOSTLYCLEANFILES =
57@@ -65,7 +65,7 @@ rebuild = rebuild=:; $(timestamp); corre 57@@ -72,7 +72,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li
58 ## ---------------- ## 58 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
59 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
60 ChangeLog.2008 ChangeLog.2009 ChangeLog.2010
61-CLEANFILES += libtool libtoolize libtoolize.tmp \
62+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
63 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
64
65 ## These are the replacements that need to be made at bootstrap time,
66@@ -231,7 +231,7 @@ configure_edit = sed \
67 -e 's,@SED\@,$(SED),g'
59 68
60 # The libtool distributor and the standalone libtool script. 69 # The libtool distributor and the standalone libtool script.
61-bin_SCRIPTS = libtoolize libtool 70-bin_SCRIPTS = libtoolize libtool
@@ -63,7 +72,7 @@ Index: libtool-2.4/Makefile.am
63 72
64 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status 73 libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
65 rm -f libtoolize.tmp libtoolize 74 rm -f libtoolize.tmp libtoolize
66@@ -90,8 +90,8 @@ $(srcdir)/libtoolize.in: $(sh_files) lib 75@@ -244,8 +244,8 @@ libtoolize: $(srcdir)/libtoolize.in $(to
67 # We used to do this with a 'stamp-vcl' file, but non-gmake builds 76 # We used to do this with a 'stamp-vcl' file, but non-gmake builds
68 # would rerun configure on every invocation, so now we manually 77 # would rerun configure on every invocation, so now we manually
69 # check the version numbers from the build rule when necessary. 78 # check the version numbers from the build rule when necessary.
@@ -74,7 +83,7 @@ Index: libtool-2.4/Makefile.am
74 if test -f "$$target"; then \ 83 if test -f "$$target"; then \
75 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \ 84 set dummy `./$$target --version | sed 1q`; actualver="$$5"; \
76 test "$$actualver" = "$$correctver" && rebuild=false; \ 85 test "$$actualver" = "$$correctver" && rebuild=false; \
77@@ -100,8 +100,8 @@ libtool: $(top_builddir)/config.status $ 86@@ -254,8 +254,8 @@ libtool: $(top_builddir)/config.status $
78 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \ 87 case $$prereq in *ChangeLog);; *) rebuild=:;; esac; \
79 done; \ 88 done; \
80 if $$rebuild; then \ 89 if $$rebuild; then \
@@ -85,16 +94,7 @@ Index: libtool-2.4/Makefile.am
85 fi 94 fi
86 95
87 .PHONY: configure-subdirs 96 .PHONY: configure-subdirs
88@@ -146,7 +146,7 @@ EXTRA_DIST += bootstrap $(srcdir)/li 97@@ -535,12 +535,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
89 ChangeLog.2002 ChangeLog.2003 ChangeLog.2004 \
90 ChangeLog.2005 ChangeLog.2006 ChangeLog.2007 \
91 ChangeLog.2008 ChangeLog.2009
92-CLEANFILES += libtool libtoolize libtoolize.tmp \
93+CLEANFILES += $(host_alias)-libtool libtoolize libtoolize.tmp \
94 $(auxdir)/ltmain.tmp $(m4dir)/ltversion.tmp
95
96 ## We build ltversion.m4 here, instead of from config.status,
97@@ -526,12 +526,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$
98 98
99 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ 99 BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \
100 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ 100 LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
index 9c8696b..438c639 100644
--- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
+++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
@@ -10,21 +10,21 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
10 10
11-Khem Raj <raj.khem@gmail.com> 11-Khem Raj <raj.khem@gmail.com>
12 12
13Index: libtool-2.4/configure 13Index: libtool-2.4.2/configure
14=================================================================== 14===================================================================
15--- libtool-2.4.orig/configure 15--- libtool-2.4.2.orig/configure
16+++ libtool-2.4/configure 16+++ libtool-2.4.2/configure
17@@ -786,7 +786,7 @@ enable_static 17@@ -795,7 +795,7 @@ enable_static
18 with_pic 18 with_pic
19 enable_fast_install 19 enable_fast_install
20 with_gnu_ld 20 with_gnu_ld
21-with_sysroot 21-with_sysroot
22+with_libtool_sysroot 22+with_libtool_sysroot
23 enable_libtool_lock 23 enable_libtool_lock
24 with_gnu_ld
25 ' 24 '
25 ac_precious_vars='build_alias
26@@ -1451,7 +1451,7 @@ Optional Packages: 26@@ -1451,7 +1451,7 @@ Optional Packages:
27 --with-pic try to use only PIC/non-PIC objects [default=use 27 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
28 both] 28 both]
29 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 29 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
30- --with-sysroot=DIR Search for dependent libraries within DIR 30- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -32,7 +32,7 @@ Index: libtool-2.4/configure
32 (or the compiler's sysroot if not specified). 32 (or the compiler's sysroot if not specified).
33 33
34 Some influential environment variables: 34 Some influential environment variables:
35@@ -6798,29 +6798,29 @@ fi 35@@ -6804,29 +6804,29 @@ fi
36 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 36 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
37 $as_echo_n "checking for sysroot... " >&6; } 37 $as_echo_n "checking for sysroot... " >&6; }
38 38
@@ -70,11 +70,11 @@ Index: libtool-2.4/configure
70 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 70 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
71 ;; 71 ;;
72 esac 72 esac
73Index: libtool-2.4/libltdl/configure 73Index: libtool-2.4.2/libltdl/configure
74=================================================================== 74===================================================================
75--- libtool-2.4.orig/libltdl/configure 75--- libtool-2.4.2.orig/libltdl/configure
76+++ libtool-2.4/libltdl/configure 76+++ libtool-2.4.2/libltdl/configure
77@@ -739,7 +739,7 @@ with_pic 77@@ -747,7 +747,7 @@ with_pic
78 enable_fast_install 78 enable_fast_install
79 enable_dependency_tracking 79 enable_dependency_tracking
80 with_gnu_ld 80 with_gnu_ld
@@ -83,8 +83,8 @@ Index: libtool-2.4/libltdl/configure
83 enable_libtool_lock 83 enable_libtool_lock
84 enable_ltdl_install 84 enable_ltdl_install
85 ' 85 '
86@@ -1388,7 +1388,7 @@ Optional Packages: 86@@ -1395,7 +1395,7 @@ Optional Packages:
87 --with-pic try to use only PIC/non-PIC objects [default=use 87 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
88 both] 88 both]
89 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 89 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
90- --with-sysroot=DIR Search for dependent libraries within DIR 90- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -92,7 +92,7 @@ Index: libtool-2.4/libltdl/configure
92 (or the compiler's sysroot if not specified). 92 (or the compiler's sysroot if not specified).
93 93
94 Some influential environment variables: 94 Some influential environment variables:
95@@ -6004,29 +6004,29 @@ fi 95@@ -6017,29 +6017,29 @@ fi
96 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 96 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
97 $as_echo_n "checking for sysroot... " >&6; } 97 $as_echo_n "checking for sysroot... " >&6; }
98 98
@@ -130,11 +130,11 @@ Index: libtool-2.4/libltdl/configure
130 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 130 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
131 ;; 131 ;;
132 esac 132 esac
133Index: libtool-2.4/libltdl/m4/libtool.m4 133Index: libtool-2.4.2/libltdl/m4/libtool.m4
134=================================================================== 134===================================================================
135--- libtool-2.4.orig/libltdl/m4/libtool.m4 135--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
136+++ libtool-2.4/libltdl/m4/libtool.m4 136+++ libtool-2.4.2/libltdl/m4/libtool.m4
137@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr 137@@ -1224,27 +1224,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr
138 # ---------------- 138 # ----------------
139 AC_DEFUN([_LT_WITH_SYSROOT], 139 AC_DEFUN([_LT_WITH_SYSROOT],
140 [AC_MSG_CHECKING([for sysroot]) 140 [AC_MSG_CHECKING([for sysroot])
@@ -168,11 +168,11 @@ Index: libtool-2.4/libltdl/m4/libtool.m4
168 AC_MSG_ERROR([The sysroot must be an absolute path.]) 168 AC_MSG_ERROR([The sysroot must be an absolute path.])
169 ;; 169 ;;
170 esac 170 esac
171Index: libtool-2.4/tests/cdemo/configure 171Index: libtool-2.4.2/tests/cdemo/configure
172=================================================================== 172===================================================================
173--- libtool-2.4.orig/tests/cdemo/configure 173--- libtool-2.4.2.orig/tests/cdemo/configure
174+++ libtool-2.4/tests/cdemo/configure 174+++ libtool-2.4.2/tests/cdemo/configure
175@@ -726,7 +726,7 @@ enable_static 175@@ -734,7 +734,7 @@ enable_static
176 with_pic 176 with_pic
177 enable_fast_install 177 enable_fast_install
178 with_gnu_ld 178 with_gnu_ld
@@ -181,8 +181,8 @@ Index: libtool-2.4/tests/cdemo/configure
181 enable_libtool_lock 181 enable_libtool_lock
182 ' 182 '
183 ac_precious_vars='build_alias 183 ac_precious_vars='build_alias
184@@ -1373,7 +1373,7 @@ Optional Packages: 184@@ -1380,7 +1380,7 @@ Optional Packages:
185 --with-pic try to use only PIC/non-PIC objects [default=use 185 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
186 both] 186 both]
187 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 187 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
188- --with-sysroot=DIR Search for dependent libraries within DIR 188- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -190,7 +190,7 @@ Index: libtool-2.4/tests/cdemo/configure
190 (or the compiler's sysroot if not specified). 190 (or the compiler's sysroot if not specified).
191 191
192 Some influential environment variables: 192 Some influential environment variables:
193@@ -5884,29 +5884,29 @@ fi 193@@ -5897,29 +5897,29 @@ fi
194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
195 $as_echo_n "checking for sysroot... " >&6; } 195 $as_echo_n "checking for sysroot... " >&6; }
196 196
@@ -228,11 +228,11 @@ Index: libtool-2.4/tests/cdemo/configure
228 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 228 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
229 ;; 229 ;;
230 esac 230 esac
231Index: libtool-2.4/tests/demo/configure 231Index: libtool-2.4.2/tests/demo/configure
232=================================================================== 232===================================================================
233--- libtool-2.4.orig/tests/demo/configure 233--- libtool-2.4.2.orig/tests/demo/configure
234+++ libtool-2.4/tests/demo/configure 234+++ libtool-2.4.2/tests/demo/configure
235@@ -730,7 +730,7 @@ enable_static 235@@ -738,7 +738,7 @@ enable_static
236 with_pic 236 with_pic
237 enable_fast_install 237 enable_fast_install
238 with_gnu_ld 238 with_gnu_ld
@@ -241,8 +241,8 @@ Index: libtool-2.4/tests/demo/configure
241 enable_libtool_lock 241 enable_libtool_lock
242 ' 242 '
243 ac_precious_vars='build_alias 243 ac_precious_vars='build_alias
244@@ -1377,7 +1377,7 @@ Optional Packages: 244@@ -1384,7 +1384,7 @@ Optional Packages:
245 --with-pic try to use only PIC/non-PIC objects [default=use 245 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
246 both] 246 both]
247 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 247 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
248- --with-sysroot=DIR Search for dependent libraries within DIR 248- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -250,7 +250,7 @@ Index: libtool-2.4/tests/demo/configure
250 (or the compiler's sysroot if not specified). 250 (or the compiler's sysroot if not specified).
251 251
252 Some influential environment variables: 252 Some influential environment variables:
253@@ -5882,29 +5882,29 @@ fi 253@@ -5895,29 +5895,29 @@ fi
254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
255 $as_echo_n "checking for sysroot... " >&6; } 255 $as_echo_n "checking for sysroot... " >&6; }
256 256
@@ -288,11 +288,11 @@ Index: libtool-2.4/tests/demo/configure
288 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 288 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
289 ;; 289 ;;
290 esac 290 esac
291Index: libtool-2.4/tests/depdemo/configure 291Index: libtool-2.4.2/tests/depdemo/configure
292=================================================================== 292===================================================================
293--- libtool-2.4.orig/tests/depdemo/configure 293--- libtool-2.4.2.orig/tests/depdemo/configure
294+++ libtool-2.4/tests/depdemo/configure 294+++ libtool-2.4.2/tests/depdemo/configure
295@@ -728,7 +728,7 @@ enable_static 295@@ -736,7 +736,7 @@ enable_static
296 with_pic 296 with_pic
297 enable_fast_install 297 enable_fast_install
298 with_gnu_ld 298 with_gnu_ld
@@ -301,8 +301,8 @@ Index: libtool-2.4/tests/depdemo/configure
301 enable_libtool_lock 301 enable_libtool_lock
302 ' 302 '
303 ac_precious_vars='build_alias 303 ac_precious_vars='build_alias
304@@ -1375,7 +1375,7 @@ Optional Packages: 304@@ -1382,7 +1382,7 @@ Optional Packages:
305 --with-pic try to use only PIC/non-PIC objects [default=use 305 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
306 both] 306 both]
307 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 307 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
308- --with-sysroot=DIR Search for dependent libraries within DIR 308- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -310,7 +310,7 @@ Index: libtool-2.4/tests/depdemo/configure
310 (or the compiler's sysroot if not specified). 310 (or the compiler's sysroot if not specified).
311 311
312 Some influential environment variables: 312 Some influential environment variables:
313@@ -5879,29 +5879,29 @@ fi 313@@ -5892,29 +5892,29 @@ fi
314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
315 $as_echo_n "checking for sysroot... " >&6; } 315 $as_echo_n "checking for sysroot... " >&6; }
316 316
@@ -348,11 +348,11 @@ Index: libtool-2.4/tests/depdemo/configure
348 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 348 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
349 ;; 349 ;;
350 esac 350 esac
351Index: libtool-2.4/tests/f77demo/configure 351Index: libtool-2.4.2/tests/f77demo/configure
352=================================================================== 352===================================================================
353--- libtool-2.4.orig/tests/f77demo/configure 353--- libtool-2.4.2.orig/tests/f77demo/configure
354+++ libtool-2.4/tests/f77demo/configure 354+++ libtool-2.4.2/tests/f77demo/configure
355@@ -730,7 +730,7 @@ enable_static 355@@ -738,7 +738,7 @@ enable_static
356 with_pic 356 with_pic
357 enable_fast_install 357 enable_fast_install
358 with_gnu_ld 358 with_gnu_ld
@@ -361,8 +361,8 @@ Index: libtool-2.4/tests/f77demo/configure
361 enable_libtool_lock 361 enable_libtool_lock
362 ' 362 '
363 ac_precious_vars='build_alias 363 ac_precious_vars='build_alias
364@@ -1382,7 +1382,7 @@ Optional Packages: 364@@ -1387,7 +1387,7 @@ Optional Packages:
365 --with-pic try to use only PIC/non-PIC objects [default=use 365 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
366 both] 366 both]
367 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 367 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
368- --with-sysroot=DIR Search for dependent libraries within DIR 368- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -370,7 +370,7 @@ Index: libtool-2.4/tests/f77demo/configure
370 (or the compiler's sysroot if not specified). 370 (or the compiler's sysroot if not specified).
371 371
372 Some influential environment variables: 372 Some influential environment variables:
373@@ -6864,29 +6864,29 @@ fi 373@@ -6877,29 +6877,29 @@ fi
374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
375 $as_echo_n "checking for sysroot... " >&6; } 375 $as_echo_n "checking for sysroot... " >&6; }
376 376
@@ -408,11 +408,11 @@ Index: libtool-2.4/tests/f77demo/configure
408 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 408 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
409 ;; 409 ;;
410 esac 410 esac
411Index: libtool-2.4/tests/fcdemo/configure 411Index: libtool-2.4.2/tests/fcdemo/configure
412=================================================================== 412===================================================================
413--- libtool-2.4.orig/tests/fcdemo/configure 413--- libtool-2.4.2.orig/tests/fcdemo/configure
414+++ libtool-2.4/tests/fcdemo/configure 414+++ libtool-2.4.2/tests/fcdemo/configure
415@@ -731,7 +731,7 @@ enable_static 415@@ -739,7 +739,7 @@ enable_static
416 with_pic 416 with_pic
417 enable_fast_install 417 enable_fast_install
418 with_gnu_ld 418 with_gnu_ld
@@ -421,8 +421,8 @@ Index: libtool-2.4/tests/fcdemo/configure
421 enable_libtool_lock 421 enable_libtool_lock
422 ' 422 '
423 ac_precious_vars='build_alias 423 ac_precious_vars='build_alias
424@@ -1383,7 +1383,7 @@ Optional Packages: 424@@ -1388,7 +1388,7 @@ Optional Packages:
425 --with-pic try to use only PIC/non-PIC objects [default=use 425 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
426 both] 426 both]
427 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 427 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
428- --with-sysroot=DIR Search for dependent libraries within DIR 428- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -430,7 +430,7 @@ Index: libtool-2.4/tests/fcdemo/configure
430 (or the compiler's sysroot if not specified). 430 (or the compiler's sysroot if not specified).
431 431
432 Some influential environment variables: 432 Some influential environment variables:
433@@ -6963,29 +6963,29 @@ fi 433@@ -6976,29 +6976,29 @@ fi
434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
435 $as_echo_n "checking for sysroot... " >&6; } 435 $as_echo_n "checking for sysroot... " >&6; }
436 436
@@ -468,11 +468,11 @@ Index: libtool-2.4/tests/fcdemo/configure
468 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 468 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
469 ;; 469 ;;
470 esac 470 esac
471Index: libtool-2.4/tests/mdemo/configure 471Index: libtool-2.4.2/tests/mdemo/configure
472=================================================================== 472===================================================================
473--- libtool-2.4.orig/tests/mdemo/configure 473--- libtool-2.4.2.orig/tests/mdemo/configure
474+++ libtool-2.4/tests/mdemo/configure 474+++ libtool-2.4.2/tests/mdemo/configure
475@@ -734,7 +734,7 @@ enable_static 475@@ -742,7 +742,7 @@ enable_static
476 with_pic 476 with_pic
477 enable_fast_install 477 enable_fast_install
478 with_gnu_ld 478 with_gnu_ld
@@ -481,8 +481,8 @@ Index: libtool-2.4/tests/mdemo/configure
481 enable_libtool_lock 481 enable_libtool_lock
482 ' 482 '
483 ac_precious_vars='build_alias 483 ac_precious_vars='build_alias
484@@ -1381,7 +1381,7 @@ Optional Packages: 484@@ -1388,7 +1388,7 @@ Optional Packages:
485 --with-pic try to use only PIC/non-PIC objects [default=use 485 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
486 both] 486 both]
487 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 487 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
488- --with-sysroot=DIR Search for dependent libraries within DIR 488- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -490,7 +490,7 @@ Index: libtool-2.4/tests/mdemo/configure
490 (or the compiler's sysroot if not specified). 490 (or the compiler's sysroot if not specified).
491 491
492 Some influential environment variables: 492 Some influential environment variables:
493@@ -5911,29 +5911,29 @@ fi 493@@ -5924,29 +5924,29 @@ fi
494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
495 $as_echo_n "checking for sysroot... " >&6; } 495 $as_echo_n "checking for sysroot... " >&6; }
496 496
@@ -528,11 +528,11 @@ Index: libtool-2.4/tests/mdemo/configure
528 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 528 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
529 ;; 529 ;;
530 esac 530 esac
531Index: libtool-2.4/tests/mdemo2/configure 531Index: libtool-2.4.2/tests/mdemo2/configure
532=================================================================== 532===================================================================
533--- libtool-2.4.orig/tests/mdemo2/configure 533--- libtool-2.4.2.orig/tests/mdemo2/configure
534+++ libtool-2.4/tests/mdemo2/configure 534+++ libtool-2.4.2/tests/mdemo2/configure
535@@ -726,7 +726,7 @@ enable_static 535@@ -734,7 +734,7 @@ enable_static
536 with_pic 536 with_pic
537 enable_fast_install 537 enable_fast_install
538 with_gnu_ld 538 with_gnu_ld
@@ -541,8 +541,8 @@ Index: libtool-2.4/tests/mdemo2/configure
541 enable_libtool_lock 541 enable_libtool_lock
542 ' 542 '
543 ac_precious_vars='build_alias 543 ac_precious_vars='build_alias
544@@ -1373,7 +1373,7 @@ Optional Packages: 544@@ -1380,7 +1380,7 @@ Optional Packages:
545 --with-pic try to use only PIC/non-PIC objects [default=use 545 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
546 both] 546 both]
547 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 547 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
548- --with-sysroot=DIR Search for dependent libraries within DIR 548- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -550,7 +550,7 @@ Index: libtool-2.4/tests/mdemo2/configure
550 (or the compiler's sysroot if not specified). 550 (or the compiler's sysroot if not specified).
551 551
552 Some influential environment variables: 552 Some influential environment variables:
553@@ -5884,29 +5884,29 @@ fi 553@@ -5897,29 +5897,29 @@ fi
554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
555 $as_echo_n "checking for sysroot... " >&6; } 555 $as_echo_n "checking for sysroot... " >&6; }
556 556
@@ -588,11 +588,11 @@ Index: libtool-2.4/tests/mdemo2/configure
588 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 588 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
589 ;; 589 ;;
590 esac 590 esac
591Index: libtool-2.4/tests/pdemo/configure 591Index: libtool-2.4.2/tests/pdemo/configure
592=================================================================== 592===================================================================
593--- libtool-2.4.orig/tests/pdemo/configure 593--- libtool-2.4.2.orig/tests/pdemo/configure
594+++ libtool-2.4/tests/pdemo/configure 594+++ libtool-2.4.2/tests/pdemo/configure
595@@ -729,7 +729,7 @@ enable_static 595@@ -737,7 +737,7 @@ enable_static
596 with_pic 596 with_pic
597 enable_fast_install 597 enable_fast_install
598 with_gnu_ld 598 with_gnu_ld
@@ -601,8 +601,8 @@ Index: libtool-2.4/tests/pdemo/configure
601 enable_libtool_lock 601 enable_libtool_lock
602 ' 602 '
603 ac_precious_vars='build_alias 603 ac_precious_vars='build_alias
604@@ -1376,7 +1376,7 @@ Optional Packages: 604@@ -1383,7 +1383,7 @@ Optional Packages:
605 --with-pic try to use only PIC/non-PIC objects [default=use 605 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
606 both] 606 both]
607 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 607 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
608- --with-sysroot=DIR Search for dependent libraries within DIR 608- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -610,7 +610,7 @@ Index: libtool-2.4/tests/pdemo/configure
610 (or the compiler's sysroot if not specified). 610 (or the compiler's sysroot if not specified).
611 611
612 Some influential environment variables: 612 Some influential environment variables:
613@@ -5887,29 +5887,29 @@ fi 613@@ -5900,29 +5900,29 @@ fi
614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
615 $as_echo_n "checking for sysroot... " >&6; } 615 $as_echo_n "checking for sysroot... " >&6; }
616 616
@@ -648,10 +648,10 @@ Index: libtool-2.4/tests/pdemo/configure
648 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 648 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
649 ;; 649 ;;
650 esac 650 esac
651Index: libtool-2.4/tests/sysroot.at 651Index: libtool-2.4.2/tests/sysroot.at
652=================================================================== 652===================================================================
653--- libtool-2.4.orig/tests/sysroot.at 653--- libtool-2.4.2.orig/tests/sysroot.at
654+++ libtool-2.4/tests/sysroot.at 654+++ libtool-2.4.2/tests/sysroot.at
655@@ -64,7 +64,7 @@ while read file; do 655@@ -64,7 +64,7 @@ while read file; do
656 done]) 656 done])
657 657
@@ -679,21 +679,21 @@ Index: libtool-2.4/tests/sysroot.at
679 AC_SUBST([sysroot]) 679 AC_SUBST([sysroot])
680 AC_OUTPUT(Makefile) 680 AC_OUTPUT(Makefile)
681 ]]) 681 ]])
682Index: libtool-2.4/tests/tagdemo/configure 682Index: libtool-2.4.2/tests/tagdemo/configure
683=================================================================== 683===================================================================
684--- libtool-2.4.orig/tests/tagdemo/configure 684--- libtool-2.4.2.orig/tests/tagdemo/configure
685+++ libtool-2.4/tests/tagdemo/configure 685+++ libtool-2.4.2/tests/tagdemo/configure
686@@ -736,7 +736,7 @@ enable_static 686@@ -744,7 +744,7 @@ enable_static
687 with_pic 687 with_pic
688 enable_fast_install 688 enable_fast_install
689 with_gnu_ld 689 with_gnu_ld
690-with_sysroot 690-with_sysroot
691+with_libtool_sysroot 691+with_libtool_sysroot
692 enable_libtool_lock 692 enable_libtool_lock
693 with_gnu_ld
694 ' 693 '
695@@ -1392,7 +1392,7 @@ Optional Packages: 694 ac_precious_vars='build_alias
696 --with-pic try to use only PIC/non-PIC objects [default=use 695@@ -1395,7 +1395,7 @@ Optional Packages:
696 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
697 both] 697 both]
698 --with-gnu-ld assume the C compiler uses GNU ld [default=no] 698 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
699- --with-sysroot=DIR Search for dependent libraries within DIR 699- --with-sysroot=DIR Search for dependent libraries within DIR
@@ -701,7 +701,7 @@ Index: libtool-2.4/tests/tagdemo/configure
701 (or the compiler's sysroot if not specified). 701 (or the compiler's sysroot if not specified).
702 702
703 Some influential environment variables: 703 Some influential environment variables:
704@@ -6907,29 +6907,29 @@ fi 704@@ -6916,29 +6916,29 @@ fi
705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
706 $as_echo_n "checking for sysroot... " >&6; } 706 $as_echo_n "checking for sysroot... " >&6; }
707 707
@@ -739,11 +739,11 @@ Index: libtool-2.4/tests/tagdemo/configure
739 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 739 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
740 ;; 740 ;;
741 esac 741 esac
742Index: libtool-2.4/tests/testsuite 742Index: libtool-2.4.2/tests/testsuite
743=================================================================== 743===================================================================
744--- libtool-2.4.orig/tests/testsuite 744--- libtool-2.4.2.orig/tests/testsuite
745+++ libtool-2.4/tests/testsuite 745+++ libtool-2.4.2/tests/testsuite
746@@ -25277,7 +25277,7 @@ $at_traceon; } 746@@ -26676,7 +26676,7 @@ $at_traceon; }
747 747
748 748
749 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 749 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -752,7 +752,7 @@ Index: libtool-2.4/tests/testsuite
752 752
753 #??? 753 #???
754 if test "$shlibpath_var" = PATH; then 754 if test "$shlibpath_var" = PATH; then
755@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign]) 755@@ -26874,7 +26874,7 @@ AM_INIT_AUTOMAKE([foreign])
756 AC_PROG_CC 756 AC_PROG_CC
757 AC_CONFIG_SRCDIR([lib2.c]) 757 AC_CONFIG_SRCDIR([lib2.c])
758 LT_INIT 758 LT_INIT
@@ -761,7 +761,7 @@ Index: libtool-2.4/tests/testsuite
761 AC_SUBST([sysroot]) 761 AC_SUBST([sysroot])
762 AC_OUTPUT(Makefile) 762 AC_OUTPUT(Makefile)
763 _ATEOF 763 _ATEOF
764@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign]) 764@@ -27051,7 +27051,7 @@ AM_INIT_AUTOMAKE([foreign])
765 AC_PROG_CC 765 AC_PROG_CC
766 AC_CONFIG_SRCDIR([prog.c]) 766 AC_CONFIG_SRCDIR([prog.c])
767 LT_INIT 767 LT_INIT
@@ -770,7 +770,7 @@ Index: libtool-2.4/tests/testsuite
770 AC_SUBST([sysroot]) 770 AC_SUBST([sysroot])
771 AC_OUTPUT(Makefile) 771 AC_OUTPUT(Makefile)
772 _ATEOF 772 _ATEOF
773@@ -25993,7 +25993,7 @@ $at_traceon; } 773@@ -27392,7 +27392,7 @@ $at_traceon; }
774 774
775 775
776 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 776 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -779,7 +779,7 @@ Index: libtool-2.4/tests/testsuite
779 779
780 #??? 780 #???
781 if test "$shlibpath_var" = PATH; then 781 if test "$shlibpath_var" = PATH; then
782@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign]) 782@@ -27590,7 +27590,7 @@ AM_INIT_AUTOMAKE([foreign])
783 AC_PROG_CC 783 AC_PROG_CC
784 AC_CONFIG_SRCDIR([lib2.c]) 784 AC_CONFIG_SRCDIR([lib2.c])
785 LT_INIT 785 LT_INIT
@@ -788,7 +788,7 @@ Index: libtool-2.4/tests/testsuite
788 AC_SUBST([sysroot]) 788 AC_SUBST([sysroot])
789 AC_OUTPUT(Makefile) 789 AC_OUTPUT(Makefile)
790 _ATEOF 790 _ATEOF
791@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign]) 791@@ -27767,7 +27767,7 @@ AM_INIT_AUTOMAKE([foreign])
792 AC_PROG_CC 792 AC_PROG_CC
793 AC_CONFIG_SRCDIR([prog.c]) 793 AC_CONFIG_SRCDIR([prog.c])
794 LT_INIT 794 LT_INIT
@@ -797,7 +797,7 @@ Index: libtool-2.4/tests/testsuite
797 AC_SUBST([sysroot]) 797 AC_SUBST([sysroot])
798 AC_OUTPUT(Makefile) 798 AC_OUTPUT(Makefile)
799 _ATEOF 799 _ATEOF
800@@ -26709,7 +26709,7 @@ $at_traceon; } 800@@ -28108,7 +28108,7 @@ $at_traceon; }
801 801
802 802
803 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 803 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
@@ -806,7 +806,7 @@ Index: libtool-2.4/tests/testsuite
806 806
807 #??? 807 #???
808 if test "$shlibpath_var" = PATH; then 808 if test "$shlibpath_var" = PATH; then
809@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign]) 809@@ -28306,7 +28306,7 @@ AM_INIT_AUTOMAKE([foreign])
810 AC_PROG_CC 810 AC_PROG_CC
811 AC_CONFIG_SRCDIR([lib2.c]) 811 AC_CONFIG_SRCDIR([lib2.c])
812 LT_INIT 812 LT_INIT
@@ -815,7 +815,7 @@ Index: libtool-2.4/tests/testsuite
815 AC_SUBST([sysroot]) 815 AC_SUBST([sysroot])
816 AC_OUTPUT(Makefile) 816 AC_OUTPUT(Makefile)
817 _ATEOF 817 _ATEOF
818@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign]) 818@@ -28483,7 +28483,7 @@ AM_INIT_AUTOMAKE([foreign])
819 AC_PROG_CC 819 AC_PROG_CC
820 AC_CONFIG_SRCDIR([prog.c]) 820 AC_CONFIG_SRCDIR([prog.c])
821 LT_INIT 821 LT_INIT
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
deleted file mode 100644
index 0341987..0000000
--- a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1Upstream-Status: Pending
2
3Sometimes .las have =/a/b/c.la in dependency_libs. This should be
4resolved to sysroot.
5
6-Khem Raj <raj.khem@gmail.com>
7
8Index: libtool-2.4/libltdl/config/ltmain.m4sh
9===================================================================
10--- libtool-2.4.orig/libltdl/config/ltmain.m4sh
11+++ libtool-2.4/libltdl/config/ltmain.m4sh
12@@ -8479,7 +8479,8 @@ EOF
13 *.la)
14 func_basename "$deplib"
15 name="$func_basename_result"
16- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
17+ func_resolve_sysroot "$deplib"
18+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
19 test -z "$libdir" && \
20 func_fatal_error "\`$deplib' is not a valid libtool archive"
21 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
22@@ -8505,7 +8506,9 @@ EOF
23 *.la)
24 func_basename "$lib"
25 name="$func_basename_result"
26- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
27+ func_resolve_sysroot "$lib"
28+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
29+
30 test -z "$libdir" && \
31 func_fatal_error "\`$lib' is not a valid libtool archive"
32 func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
33@@ -8524,7 +8527,8 @@ EOF
34 # the library:
35 func_basename "$lib"
36 name="$func_basename_result"
37- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
38+ func_resolve_sysroot "$lib"
39+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
40 test -z "$libdir" && \
41 func_fatal_error "\`$lib' is not a valid libtool archive"
42 func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
diff --git a/meta/recipes-devtools/libtool/libtool/trailingslash.patch b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
index d71a770..bb7a761 100644
--- a/meta/recipes-devtools/libtool/libtool/trailingslash.patch
+++ b/meta/recipes-devtools/libtool/libtool/trailingslash.patch
@@ -11,12 +11,12 @@ Merged a patch received from Gary Thomas <gary@mlbassoc.com>
11Date: 2010/07/12 11Date: 2010/07/12
12Nitin A Kamble <nitin.a.kamble@intel.com> 12Nitin A Kamble <nitin.a.kamble@intel.com>
13 13
14Index: libtool-2.2.10/libltdl/config/ltmain.m4sh 14Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
15=================================================================== 15===================================================================
16--- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh 16--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
17+++ libtool-2.2.10/libltdl/config/ltmain.m4sh 17+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
18@@ -1634,8 +1634,15 @@ func_mode_install () 18@@ -2167,8 +2167,15 @@ func_mode_install ()
19 dir="$dir$objdir" 19 func_append dir "$objdir"
20 20
21 if test -n "$relink_command"; then 21 if test -n "$relink_command"; then
22+ # Strip any trailing slash from the destination. 22+ # Strip any trailing slash from the destination.
diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
index 5e2eec9..0cd66ad 100644
--- a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
+++ b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
@@ -7,11 +7,11 @@ i.e. when lt_sysroot is not set, it will still behave the same and add
7 7
8-Khem Raj <raj.khem@gmail.com> 8-Khem Raj <raj.khem@gmail.com>
9 9
10Index: libtool-2.4/libltdl/config/ltmain.m4sh 10Index: libtool-2.4.2/libltdl/config/ltmain.m4sh
11=================================================================== 11===================================================================
12--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 12--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh
13+++ libtool-2.4/libltdl/config/ltmain.m4sh 13+++ libtool-2.4.2/libltdl/config/ltmain.m4sh
14@@ -6122,7 +6122,7 @@ func_mode_link () 14@@ -6138,7 +6138,7 @@ func_mode_link ()
15 fi 15 fi
16 else 16 else
17 # We cannot seem to hardcode it, guess we'll fake it. 17 # We cannot seem to hardcode it, guess we'll fake it.
diff --git a/meta/recipes-devtools/libtool/libtool_2.4.bb b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
index 3002215..a2eb4ea 100644
--- a/meta/recipes-devtools/libtool/libtool_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool_2.4.2.bb
@@ -1,6 +1,6 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "r4" 3PR = "${INC_PR}.0"
4 4
5# 5#
6# We want the results of libtool-cross preserved - don't stage anything ourselves. 6# We want the results of libtool-cross preserved - don't stage anything ourselves.