summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2010-12-21 10:46:15 -0800
committerSaul Wold <sgw@linux.intel.com>2011-01-21 01:36:14 -0800
commit62dc23953d87babc69a7fbf4b0bd61d093577167 (patch)
treed0b11895e9d797bf3363a9965f0a06894975206c /meta
parent66988ee0a236165e940fe9c6609f37f8a3491d9f (diff)
downloadpoky-62dc23953d87babc69a7fbf4b0bd61d093577167.tar.gz
libtool: Changes to enable sysroot support
* Added OE patches by Khem Raj which enable sysroot support and rename the command line option --with-sysroot to --with-libtool-sysroot to avoid conflicts with binutils and gcc * Removed obsolete cross_compile.patch * Changed SRC_URI_append to SRC_URI += * PR bump for all recipes Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/libtool/libtool-2.4.inc2
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.bb3
-rw-r--r--meta/recipes-devtools/libtool/libtool-native_2.4.bb7
-rw-r--r--meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb3
-rw-r--r--meta/recipes-devtools/libtool/libtool.inc5
-rw-r--r--meta/recipes-devtools/libtool/libtool/cross_compile.patch38
-rw-r--r--meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch824
-rw-r--r--meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch40
-rw-r--r--meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch20
9 files changed, 896 insertions, 46 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.inc b/meta/recipes-devtools/libtool/libtool-2.4.inc
index 53ee882ee5..e3d17b71d5 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.inc
@@ -9,3 +9,5 @@ FILES_libltdl-dbg = "${libdir}/.debug/"
9 9
10SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021" 10SRC_URI[md5sum] = "b32b04148ecdd7344abc6fe8bd1bb021"
11SRC_URI[sha256sum] = "13df57ab63a94e196c5d6e95d64e53262834fe780d5e82c28f177f9f71ddf62e" 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.bb
index 3193ba28ea..cd2bcecaf9 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
@@ -2,8 +2,7 @@ require libtool-${PV}.inc
2 2
3PR = "r1" 3PR = "r1"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI_append = " file://cross_compile.patch \ 5SRC_URI += "file://prefix.patch"
6 file://prefix.patch "
7 6
8do_configure_prepend () { 7do_configure_prepend () {
9 # Remove any existing libtool m4 since old stale versions would break 8 # Remove any existing libtool m4 since old stale versions would break
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
index 20981a5ba5..4163e8972a 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.4.bb
@@ -2,12 +2,13 @@ require libtool-${PV}.inc
2 2
3DEPENDS = "" 3DEPENDS = ""
4 4
5PR = "r0" 5PR = "r1"
6SRC_URI_append = " file://cross_compile.patch \ 6SRC_URI += "file://prefix.patch"
7 file://prefix.patch "
8 7
9inherit native 8inherit native
10 9
10EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_NATIVE}"
11
11do_configure_prepend () { 12do_configure_prepend () {
12 # Remove any existing libtool m4 since old stale versions would break 13 # Remove any existing libtool m4 since old stale versions would break
13 # any upgrade 14 # any upgrade
diff --git a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
index ac95b43fd4..2c01a4eb8e 100644
--- a/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-nativesdk_2.4.bb
@@ -1,8 +1,7 @@
1require libtool-${PV}.inc 1require libtool-${PV}.inc
2 2
3PR = "r1" 3PR = "r1"
4SRC_URI_append = " file://cross_compile.patch \ 4SRC_URI += "file://prefix.patch"
5 file://prefix.patch "
6 5
7inherit nativesdk 6inherit nativesdk
8 7
diff --git a/meta/recipes-devtools/libtool/libtool.inc b/meta/recipes-devtools/libtool/libtool.inc
index 370d972aca..bccb7698b4 100644
--- a/meta/recipes-devtools/libtool/libtool.inc
+++ b/meta/recipes-devtools/libtool/libtool.inc
@@ -10,7 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
10 10
11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
12 file://trailingslash.patch \ 12 file://trailingslash.patch \
13 file://prefix-manpage-fix.patch " 13 file://prefix-manpage-fix.patch \
14 file://rename-with-sysroot.patch \
15 file://resolve-sysroot.patch \
16 file://use-sysroot-in-libpath.patch"
14 17
15do_compile_prepend () { 18do_compile_prepend () {
16 # Sometimes this file doesn't get rebuilt, force the issue 19 # Sometimes this file doesn't get rebuilt, force the issue
diff --git a/meta/recipes-devtools/libtool/libtool/cross_compile.patch b/meta/recipes-devtools/libtool/libtool/cross_compile.patch
deleted file mode 100644
index 28539ff039..0000000000
--- a/meta/recipes-devtools/libtool/libtool/cross_compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1Tweaks to make cross-compiling work combined and updated from various
2older patches, some by Chris Larson.
3Not upstreable in this form.
4
5RP - 01/05/2008
6
7Index: libtool-2.4/libltdl/config/ltmain.m4sh
8===================================================================
9--- libtool-2.4.orig/libltdl/config/ltmain.m4sh
10+++ libtool-2.4/libltdl/config/ltmain.m4sh
11@@ -6121,8 +6121,6 @@ func_mode_link ()
12 add="$libdir/$linklib"
13 fi
14 else
15- # We cannot seem to hardcode it, guess we'll fake it.
16- add_dir="-L$libdir"
17 # Try looking first in the location we're being installed to.
18 if test -n "$inst_prefix_dir"; then
19 case $libdir in
20@@ -6277,7 +6275,17 @@ func_mode_link ()
21 fi
22 ;;
23 *)
24- path="-L$absdir/$objdir"
25+ # OE sets installed=no in staging. We need to look in $objdir and $absdir,
26+ # preferring $objdir. RP 31/04/2008
27+ if test -f "$absdir/$objdir/$depdepl" ; then
28+ depdepl="$absdir/$objdir/$depdepl"
29+ path="-L$absdir/$objdir"
30+ elif test -f "$absdir/$depdepl" ; then
31+ depdepl="$absdir/$depdepl"
32+ path="-L$absdir"
33+ else
34+ path="-L$absdir/$objdir"
35+ fi
36 ;;
37 esac
38 else
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
new file mode 100644
index 0000000000..8455d950df
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
@@ -0,0 +1,824 @@
1This patch renames the --with-sysroot option to --with-libtool-sysroot
2to avoid namespace conflict with binutils, gcc and other toolchain
3components.
4
5I also reported the problem to libtool here
6
7http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
8
9-Khem Raj <raj.khem@gmail.com>
10
11Index: libtool-2.4/configure
12===================================================================
13--- libtool-2.4.orig/configure
14+++ libtool-2.4/configure
15@@ -786,7 +786,7 @@ enable_static
16 with_pic
17 enable_fast_install
18 with_gnu_ld
19-with_sysroot
20+with_libtool_sysroot
21 enable_libtool_lock
22 with_gnu_ld
23 '
24@@ -1451,7 +1451,7 @@ Optional Packages:
25 --with-pic try to use only PIC/non-PIC objects [default=use
26 both]
27 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
28- --with-sysroot=DIR Search for dependent libraries within DIR
29+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
30 (or the compiler's sysroot if not specified).
31
32 Some influential environment variables:
33@@ -6798,29 +6798,29 @@ fi
34 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
35 $as_echo_n "checking for sysroot... " >&6; }
36
37-# Check whether --with-sysroot was given.
38-if test "${with_sysroot+set}" = set; then :
39- withval=$with_sysroot;
40+# Check whether --with-libtool-sysroot was given.
41+if test "${with_libtool_sysroot+set}" = set; then :
42+ withval=$with_libtool_sysroot;
43 else
44- with_sysroot=no
45+ with_libtool_sysroot=no
46 fi
47
48
49 lt_sysroot=
50-case ${with_sysroot} in #(
51+case ${with_libtool_sysroot} in #(
52 yes)
53 if test "$GCC" = yes; then
54 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
55 fi
56 ;; #(
57 /*)
58- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
59+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
60 ;; #(
61 no|'')
62 ;; #(
63 *)
64- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
65-$as_echo "${with_sysroot}" >&6; }
66+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
67+$as_echo "${with_libtool_sysroot}" >&6; }
68 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
69 ;;
70 esac
71Index: libtool-2.4/libltdl/configure
72===================================================================
73--- libtool-2.4.orig/libltdl/configure
74+++ libtool-2.4/libltdl/configure
75@@ -739,7 +739,7 @@ with_pic
76 enable_fast_install
77 enable_dependency_tracking
78 with_gnu_ld
79-with_sysroot
80+with_libtool_sysroot
81 enable_libtool_lock
82 enable_ltdl_install
83 '
84@@ -1388,7 +1388,7 @@ Optional Packages:
85 --with-pic try to use only PIC/non-PIC objects [default=use
86 both]
87 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
88- --with-sysroot=DIR Search for dependent libraries within DIR
89+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
90 (or the compiler's sysroot if not specified).
91
92 Some influential environment variables:
93@@ -6004,29 +6004,29 @@ fi
94 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
95 $as_echo_n "checking for sysroot... " >&6; }
96
97-# Check whether --with-sysroot was given.
98-if test "${with_sysroot+set}" = set; then :
99- withval=$with_sysroot;
100+# Check whether --with-libtool-sysroot was given.
101+if test "${with_libtool_sysroot+set}" = set; then :
102+ withval=$with_libtool_sysroot;
103 else
104- with_sysroot=no
105+ with_libtool_sysroot=no
106 fi
107
108
109 lt_sysroot=
110-case ${with_sysroot} in #(
111+case ${with_libtool_sysroot} in #(
112 yes)
113 if test "$GCC" = yes; then
114 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
115 fi
116 ;; #(
117 /*)
118- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
119+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
120 ;; #(
121 no|'')
122 ;; #(
123 *)
124- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
125-$as_echo "${with_sysroot}" >&6; }
126+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
127+$as_echo "${with_libtool_sysroot}" >&6; }
128 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
129 ;;
130 esac
131Index: libtool-2.4/libltdl/m4/libtool.m4
132===================================================================
133--- libtool-2.4.orig/libltdl/m4/libtool.m4
134+++ libtool-2.4/libltdl/m4/libtool.m4
135@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr
136 # ----------------
137 AC_DEFUN([_LT_WITH_SYSROOT],
138 [AC_MSG_CHECKING([for sysroot])
139-AC_ARG_WITH([sysroot],
140-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
141+AC_ARG_WITH([libtool-sysroot],
142+[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR
143 (or the compiler's sysroot if not specified).],
144-[], [with_sysroot=no])
145+[], [with_libtool_sysroot=no])
146
147 dnl lt_sysroot will always be passed unquoted. We quote it here
148 dnl in case the user passed a directory name.
149 lt_sysroot=
150-case ${with_sysroot} in #(
151+case ${with_libtool_sysroot} in #(
152 yes)
153 if test "$GCC" = yes; then
154 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
155 fi
156 ;; #(
157 /*)
158- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
159+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
160 ;; #(
161 no|'')
162 ;; #(
163 *)
164- AC_MSG_RESULT([${with_sysroot}])
165+ AC_MSG_RESULT([${with_libtool_sysroot}])
166 AC_MSG_ERROR([The sysroot must be an absolute path.])
167 ;;
168 esac
169Index: libtool-2.4/tests/cdemo/configure
170===================================================================
171--- libtool-2.4.orig/tests/cdemo/configure
172+++ libtool-2.4/tests/cdemo/configure
173@@ -726,7 +726,7 @@ enable_static
174 with_pic
175 enable_fast_install
176 with_gnu_ld
177-with_sysroot
178+with_libtool_sysroot
179 enable_libtool_lock
180 '
181 ac_precious_vars='build_alias
182@@ -1373,7 +1373,7 @@ Optional Packages:
183 --with-pic try to use only PIC/non-PIC objects [default=use
184 both]
185 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
186- --with-sysroot=DIR Search for dependent libraries within DIR
187+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
188 (or the compiler's sysroot if not specified).
189
190 Some influential environment variables:
191@@ -5884,29 +5884,29 @@ fi
192 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
193 $as_echo_n "checking for sysroot... " >&6; }
194
195-# Check whether --with-sysroot was given.
196-if test "${with_sysroot+set}" = set; then :
197- withval=$with_sysroot;
198+# Check whether --with-libtool-sysroot was given.
199+if test "${with_libtool_sysroot+set}" = set; then :
200+ withval=$with_libtool_sysroot;
201 else
202- with_sysroot=no
203+ with_libtool_sysroot=no
204 fi
205
206
207 lt_sysroot=
208-case ${with_sysroot} in #(
209+case ${with_libtool_sysroot} in #(
210 yes)
211 if test "$GCC" = yes; then
212 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
213 fi
214 ;; #(
215 /*)
216- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
217+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
218 ;; #(
219 no|'')
220 ;; #(
221 *)
222- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
223-$as_echo "${with_sysroot}" >&6; }
224+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
225+$as_echo "${with_libtool_sysroot}" >&6; }
226 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
227 ;;
228 esac
229Index: libtool-2.4/tests/demo/configure
230===================================================================
231--- libtool-2.4.orig/tests/demo/configure
232+++ libtool-2.4/tests/demo/configure
233@@ -730,7 +730,7 @@ enable_static
234 with_pic
235 enable_fast_install
236 with_gnu_ld
237-with_sysroot
238+with_libtool_sysroot
239 enable_libtool_lock
240 '
241 ac_precious_vars='build_alias
242@@ -1377,7 +1377,7 @@ Optional Packages:
243 --with-pic try to use only PIC/non-PIC objects [default=use
244 both]
245 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
246- --with-sysroot=DIR Search for dependent libraries within DIR
247+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
248 (or the compiler's sysroot if not specified).
249
250 Some influential environment variables:
251@@ -5882,29 +5882,29 @@ fi
252 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
253 $as_echo_n "checking for sysroot... " >&6; }
254
255-# Check whether --with-sysroot was given.
256-if test "${with_sysroot+set}" = set; then :
257- withval=$with_sysroot;
258+# Check whether --with-libtool-sysroot was given.
259+if test "${with_libtool_sysroot+set}" = set; then :
260+ withval=$with_libtool_sysroot;
261 else
262- with_sysroot=no
263+ with_libtool_sysroot=no
264 fi
265
266
267 lt_sysroot=
268-case ${with_sysroot} in #(
269+case ${with_libtool_sysroot} in #(
270 yes)
271 if test "$GCC" = yes; then
272 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
273 fi
274 ;; #(
275 /*)
276- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
277+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
278 ;; #(
279 no|'')
280 ;; #(
281 *)
282- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
283-$as_echo "${with_sysroot}" >&6; }
284+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
285+$as_echo "${with_libtool_sysroot}" >&6; }
286 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
287 ;;
288 esac
289Index: libtool-2.4/tests/depdemo/configure
290===================================================================
291--- libtool-2.4.orig/tests/depdemo/configure
292+++ libtool-2.4/tests/depdemo/configure
293@@ -728,7 +728,7 @@ enable_static
294 with_pic
295 enable_fast_install
296 with_gnu_ld
297-with_sysroot
298+with_libtool_sysroot
299 enable_libtool_lock
300 '
301 ac_precious_vars='build_alias
302@@ -1375,7 +1375,7 @@ Optional Packages:
303 --with-pic try to use only PIC/non-PIC objects [default=use
304 both]
305 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
306- --with-sysroot=DIR Search for dependent libraries within DIR
307+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
308 (or the compiler's sysroot if not specified).
309
310 Some influential environment variables:
311@@ -5879,29 +5879,29 @@ fi
312 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
313 $as_echo_n "checking for sysroot... " >&6; }
314
315-# Check whether --with-sysroot was given.
316-if test "${with_sysroot+set}" = set; then :
317- withval=$with_sysroot;
318+# Check whether --with-libtool-sysroot was given.
319+if test "${with_libtool_sysroot+set}" = set; then :
320+ withval=$with_libtool_sysroot;
321 else
322- with_sysroot=no
323+ with_libtool_sysroot=no
324 fi
325
326
327 lt_sysroot=
328-case ${with_sysroot} in #(
329+case ${with_libtool_sysroot} in #(
330 yes)
331 if test "$GCC" = yes; then
332 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
333 fi
334 ;; #(
335 /*)
336- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
337+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
338 ;; #(
339 no|'')
340 ;; #(
341 *)
342- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
343-$as_echo "${with_sysroot}" >&6; }
344+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
345+$as_echo "${with_libtool_sysroot}" >&6; }
346 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
347 ;;
348 esac
349Index: libtool-2.4/tests/f77demo/configure
350===================================================================
351--- libtool-2.4.orig/tests/f77demo/configure
352+++ libtool-2.4/tests/f77demo/configure
353@@ -730,7 +730,7 @@ enable_static
354 with_pic
355 enable_fast_install
356 with_gnu_ld
357-with_sysroot
358+with_libtool_sysroot
359 enable_libtool_lock
360 '
361 ac_precious_vars='build_alias
362@@ -1382,7 +1382,7 @@ Optional Packages:
363 --with-pic try to use only PIC/non-PIC objects [default=use
364 both]
365 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
366- --with-sysroot=DIR Search for dependent libraries within DIR
367+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
368 (or the compiler's sysroot if not specified).
369
370 Some influential environment variables:
371@@ -6864,29 +6864,29 @@ fi
372 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
373 $as_echo_n "checking for sysroot... " >&6; }
374
375-# Check whether --with-sysroot was given.
376-if test "${with_sysroot+set}" = set; then :
377- withval=$with_sysroot;
378+# Check whether --with-libtool-sysroot was given.
379+if test "${with_libtool_sysroot+set}" = set; then :
380+ withval=$with_libtool_sysroot;
381 else
382- with_sysroot=no
383+ with_libtool_sysroot=no
384 fi
385
386
387 lt_sysroot=
388-case ${with_sysroot} in #(
389+case ${with_libtool_sysroot} in #(
390 yes)
391 if test "$GCC" = yes; then
392 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
393 fi
394 ;; #(
395 /*)
396- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
397+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
398 ;; #(
399 no|'')
400 ;; #(
401 *)
402- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
403-$as_echo "${with_sysroot}" >&6; }
404+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
405+$as_echo "${with_libtool_sysroot}" >&6; }
406 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
407 ;;
408 esac
409Index: libtool-2.4/tests/fcdemo/configure
410===================================================================
411--- libtool-2.4.orig/tests/fcdemo/configure
412+++ libtool-2.4/tests/fcdemo/configure
413@@ -731,7 +731,7 @@ enable_static
414 with_pic
415 enable_fast_install
416 with_gnu_ld
417-with_sysroot
418+with_libtool_sysroot
419 enable_libtool_lock
420 '
421 ac_precious_vars='build_alias
422@@ -1383,7 +1383,7 @@ Optional Packages:
423 --with-pic try to use only PIC/non-PIC objects [default=use
424 both]
425 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
426- --with-sysroot=DIR Search for dependent libraries within DIR
427+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
428 (or the compiler's sysroot if not specified).
429
430 Some influential environment variables:
431@@ -6963,29 +6963,29 @@ fi
432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
433 $as_echo_n "checking for sysroot... " >&6; }
434
435-# Check whether --with-sysroot was given.
436-if test "${with_sysroot+set}" = set; then :
437- withval=$with_sysroot;
438+# Check whether --with-libtool-sysroot was given.
439+if test "${with_libtool_sysroot+set}" = set; then :
440+ withval=$with_libtool_sysroot;
441 else
442- with_sysroot=no
443+ with_libtool_sysroot=no
444 fi
445
446
447 lt_sysroot=
448-case ${with_sysroot} in #(
449+case ${with_libtool_sysroot} in #(
450 yes)
451 if test "$GCC" = yes; then
452 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
453 fi
454 ;; #(
455 /*)
456- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
457+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
458 ;; #(
459 no|'')
460 ;; #(
461 *)
462- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
463-$as_echo "${with_sysroot}" >&6; }
464+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
465+$as_echo "${with_libtool_sysroot}" >&6; }
466 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
467 ;;
468 esac
469Index: libtool-2.4/tests/mdemo/configure
470===================================================================
471--- libtool-2.4.orig/tests/mdemo/configure
472+++ libtool-2.4/tests/mdemo/configure
473@@ -734,7 +734,7 @@ enable_static
474 with_pic
475 enable_fast_install
476 with_gnu_ld
477-with_sysroot
478+with_libtool_sysroot
479 enable_libtool_lock
480 '
481 ac_precious_vars='build_alias
482@@ -1381,7 +1381,7 @@ Optional Packages:
483 --with-pic try to use only PIC/non-PIC objects [default=use
484 both]
485 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
486- --with-sysroot=DIR Search for dependent libraries within DIR
487+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
488 (or the compiler's sysroot if not specified).
489
490 Some influential environment variables:
491@@ -5911,29 +5911,29 @@ fi
492 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
493 $as_echo_n "checking for sysroot... " >&6; }
494
495-# Check whether --with-sysroot was given.
496-if test "${with_sysroot+set}" = set; then :
497- withval=$with_sysroot;
498+# Check whether --with-libtool-sysroot was given.
499+if test "${with_libtool_sysroot+set}" = set; then :
500+ withval=$with_libtool_sysroot;
501 else
502- with_sysroot=no
503+ with_libtool_sysroot=no
504 fi
505
506
507 lt_sysroot=
508-case ${with_sysroot} in #(
509+case ${with_libtool_sysroot} in #(
510 yes)
511 if test "$GCC" = yes; then
512 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
513 fi
514 ;; #(
515 /*)
516- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
517+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
518 ;; #(
519 no|'')
520 ;; #(
521 *)
522- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
523-$as_echo "${with_sysroot}" >&6; }
524+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
525+$as_echo "${with_libtool_sysroot}" >&6; }
526 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
527 ;;
528 esac
529Index: libtool-2.4/tests/mdemo2/configure
530===================================================================
531--- libtool-2.4.orig/tests/mdemo2/configure
532+++ libtool-2.4/tests/mdemo2/configure
533@@ -726,7 +726,7 @@ enable_static
534 with_pic
535 enable_fast_install
536 with_gnu_ld
537-with_sysroot
538+with_libtool_sysroot
539 enable_libtool_lock
540 '
541 ac_precious_vars='build_alias
542@@ -1373,7 +1373,7 @@ Optional Packages:
543 --with-pic try to use only PIC/non-PIC objects [default=use
544 both]
545 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
546- --with-sysroot=DIR Search for dependent libraries within DIR
547+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
548 (or the compiler's sysroot if not specified).
549
550 Some influential environment variables:
551@@ -5884,29 +5884,29 @@ fi
552 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
553 $as_echo_n "checking for sysroot... " >&6; }
554
555-# Check whether --with-sysroot was given.
556-if test "${with_sysroot+set}" = set; then :
557- withval=$with_sysroot;
558+# Check whether --with-libtool-sysroot was given.
559+if test "${with_libtool_sysroot+set}" = set; then :
560+ withval=$with_libtool_sysroot;
561 else
562- with_sysroot=no
563+ with_libtool_sysroot=no
564 fi
565
566
567 lt_sysroot=
568-case ${with_sysroot} in #(
569+case ${with_libtool_sysroot} in #(
570 yes)
571 if test "$GCC" = yes; then
572 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
573 fi
574 ;; #(
575 /*)
576- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
577+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
578 ;; #(
579 no|'')
580 ;; #(
581 *)
582- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
583-$as_echo "${with_sysroot}" >&6; }
584+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
585+$as_echo "${with_libtool_sysroot}" >&6; }
586 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
587 ;;
588 esac
589Index: libtool-2.4/tests/pdemo/configure
590===================================================================
591--- libtool-2.4.orig/tests/pdemo/configure
592+++ libtool-2.4/tests/pdemo/configure
593@@ -729,7 +729,7 @@ enable_static
594 with_pic
595 enable_fast_install
596 with_gnu_ld
597-with_sysroot
598+with_libtool_sysroot
599 enable_libtool_lock
600 '
601 ac_precious_vars='build_alias
602@@ -1376,7 +1376,7 @@ Optional Packages:
603 --with-pic try to use only PIC/non-PIC objects [default=use
604 both]
605 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
606- --with-sysroot=DIR Search for dependent libraries within DIR
607+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
608 (or the compiler's sysroot if not specified).
609
610 Some influential environment variables:
611@@ -5887,29 +5887,29 @@ fi
612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
613 $as_echo_n "checking for sysroot... " >&6; }
614
615-# Check whether --with-sysroot was given.
616-if test "${with_sysroot+set}" = set; then :
617- withval=$with_sysroot;
618+# Check whether --with-libtool-sysroot was given.
619+if test "${with_libtool_sysroot+set}" = set; then :
620+ withval=$with_libtool_sysroot;
621 else
622- with_sysroot=no
623+ with_libtool_sysroot=no
624 fi
625
626
627 lt_sysroot=
628-case ${with_sysroot} in #(
629+case ${with_libtool_sysroot} in #(
630 yes)
631 if test "$GCC" = yes; then
632 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
633 fi
634 ;; #(
635 /*)
636- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
637+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
638 ;; #(
639 no|'')
640 ;; #(
641 *)
642- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
643-$as_echo "${with_sysroot}" >&6; }
644+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
645+$as_echo "${with_libtool_sysroot}" >&6; }
646 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
647 ;;
648 esac
649Index: libtool-2.4/tests/sysroot.at
650===================================================================
651--- libtool-2.4.orig/tests/sysroot.at
652+++ libtool-2.4/tests/sysroot.at
653@@ -64,7 +64,7 @@ while read file; do
654 done])
655
656 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
657-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
658+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
659
660 #???
661 if test "$shlibpath_var" = PATH; then
662@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign])
663 AC_PROG_CC
664 AC_CONFIG_SRCDIR([lib2.c])
665 LT_INIT
666-sysroot=$with_sysroot
667+sysroot=$with_libtool_sysroot
668 AC_SUBST([sysroot])
669 AC_OUTPUT(Makefile)
670 ]])
671@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign])
672 AC_PROG_CC
673 AC_CONFIG_SRCDIR([prog.c])
674 LT_INIT
675-sysroot=$with_sysroot
676+sysroot=$with_libtool_sysroot
677 AC_SUBST([sysroot])
678 AC_OUTPUT(Makefile)
679 ]])
680Index: libtool-2.4/tests/tagdemo/configure
681===================================================================
682--- libtool-2.4.orig/tests/tagdemo/configure
683+++ libtool-2.4/tests/tagdemo/configure
684@@ -736,7 +736,7 @@ enable_static
685 with_pic
686 enable_fast_install
687 with_gnu_ld
688-with_sysroot
689+with_libtool_sysroot
690 enable_libtool_lock
691 with_gnu_ld
692 '
693@@ -1392,7 +1392,7 @@ Optional Packages:
694 --with-pic try to use only PIC/non-PIC objects [default=use
695 both]
696 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
697- --with-sysroot=DIR Search for dependent libraries within DIR
698+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
699 (or the compiler's sysroot if not specified).
700
701 Some influential environment variables:
702@@ -6907,29 +6907,29 @@ fi
703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
704 $as_echo_n "checking for sysroot... " >&6; }
705
706-# Check whether --with-sysroot was given.
707-if test "${with_sysroot+set}" = set; then :
708- withval=$with_sysroot;
709+# Check whether --with-libtool-sysroot was given.
710+if test "${with_libtool_sysroot+set}" = set; then :
711+ withval=$with_libtool_sysroot;
712 else
713- with_sysroot=no
714+ with_libtool_sysroot=no
715 fi
716
717
718 lt_sysroot=
719-case ${with_sysroot} in #(
720+case ${with_libtool_sysroot} in #(
721 yes)
722 if test "$GCC" = yes; then
723 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
724 fi
725 ;; #(
726 /*)
727- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
728+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
729 ;; #(
730 no|'')
731 ;; #(
732 *)
733- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
734-$as_echo "${with_sysroot}" >&6; }
735+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
736+$as_echo "${with_libtool_sysroot}" >&6; }
737 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
738 ;;
739 esac
740Index: libtool-2.4/tests/testsuite
741===================================================================
742--- libtool-2.4.orig/tests/testsuite
743+++ libtool-2.4/tests/testsuite
744@@ -25277,7 +25277,7 @@ $at_traceon; }
745
746
747 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
748-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
749+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
750
751 #???
752 if test "$shlibpath_var" = PATH; then
753@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign])
754 AC_PROG_CC
755 AC_CONFIG_SRCDIR([lib2.c])
756 LT_INIT
757-sysroot=$with_sysroot
758+sysroot=$with_libtool_sysroot
759 AC_SUBST([sysroot])
760 AC_OUTPUT(Makefile)
761 _ATEOF
762@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign])
763 AC_PROG_CC
764 AC_CONFIG_SRCDIR([prog.c])
765 LT_INIT
766-sysroot=$with_sysroot
767+sysroot=$with_libtool_sysroot
768 AC_SUBST([sysroot])
769 AC_OUTPUT(Makefile)
770 _ATEOF
771@@ -25993,7 +25993,7 @@ $at_traceon; }
772
773
774 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
775-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
776+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
777
778 #???
779 if test "$shlibpath_var" = PATH; then
780@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign])
781 AC_PROG_CC
782 AC_CONFIG_SRCDIR([lib2.c])
783 LT_INIT
784-sysroot=$with_sysroot
785+sysroot=$with_libtool_sysroot
786 AC_SUBST([sysroot])
787 AC_OUTPUT(Makefile)
788 _ATEOF
789@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign])
790 AC_PROG_CC
791 AC_CONFIG_SRCDIR([prog.c])
792 LT_INIT
793-sysroot=$with_sysroot
794+sysroot=$with_libtool_sysroot
795 AC_SUBST([sysroot])
796 AC_OUTPUT(Makefile)
797 _ATEOF
798@@ -26709,7 +26709,7 @@ $at_traceon; }
799
800
801 LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
802-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
803+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
804
805 #???
806 if test "$shlibpath_var" = PATH; then
807@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign])
808 AC_PROG_CC
809 AC_CONFIG_SRCDIR([lib2.c])
810 LT_INIT
811-sysroot=$with_sysroot
812+sysroot=$with_libtool_sysroot
813 AC_SUBST([sysroot])
814 AC_OUTPUT(Makefile)
815 _ATEOF
816@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign])
817 AC_PROG_CC
818 AC_CONFIG_SRCDIR([prog.c])
819 LT_INIT
820-sysroot=$with_sysroot
821+sysroot=$with_libtool_sysroot
822 AC_SUBST([sysroot])
823 AC_OUTPUT(Makefile)
824 _ATEOF
diff --git a/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
new file mode 100644
index 0000000000..54f7f5b736
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/resolve-sysroot.patch
@@ -0,0 +1,40 @@
1Sometimes .las have =/a/b/c.la in dependency_libs. This should be
2resolved to sysroot.
3
4-Khem Raj <raj.khem@gmail.com>
5
6Index: libtool-2.4/libltdl/config/ltmain.m4sh
7===================================================================
8--- libtool-2.4.orig/libltdl/config/ltmain.m4sh
9+++ libtool-2.4/libltdl/config/ltmain.m4sh
10@@ -8479,7 +8479,8 @@ EOF
11 *.la)
12 func_basename "$deplib"
13 name="$func_basename_result"
14- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
15+ func_resolve_sysroot "$deplib"
16+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
17 test -z "$libdir" && \
18 func_fatal_error "\`$deplib' is not a valid libtool archive"
19 func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
20@@ -8505,7 +8506,9 @@ EOF
21 *.la)
22 func_basename "$lib"
23 name="$func_basename_result"
24- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
25+ func_resolve_sysroot "$lib"
26+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
27+
28 test -z "$libdir" && \
29 func_fatal_error "\`$lib' is not a valid libtool archive"
30 func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
31@@ -8524,7 +8527,8 @@ EOF
32 # the library:
33 func_basename "$lib"
34 name="$func_basename_result"
35- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
36+ func_resolve_sysroot "$lib"
37+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
38 test -z "$libdir" && \
39 func_fatal_error "\`$lib' is not a valid libtool archive"
40 func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
diff --git a/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
new file mode 100644
index 0000000000..4d9e90c144
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool/use-sysroot-in-libpath.patch
@@ -0,0 +1,20 @@
1When using sysroot we should append it to libdir, which is helpful in
2cross builds as the system is staged in the sysroot. For normal builds,
3i.e. when lt_sysroot is not set, it will still behave the same and add
4-L/usr/lib to the relink command.
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@@ -6122,7 +6122,7 @@ func_mode_link ()
13 fi
14 else
15 # We cannot seem to hardcode it, guess we'll fake it.
16- add_dir="-L$libdir"
17+ add_dir="-L$lt_sysroot$libdir"
18 # Try looking first in the location we're being installed to.
19 if test -n "$inst_prefix_dir"; then
20 case $libdir in
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 07:03:49 +0000