summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-27 09:59:43 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:11:57 +0100
commit2e1cb7917056558324143634a5dd479e70d10d55 (patch)
treeea71d92e19656d1901766a9a950190e93c66917a /meta
parent08d902ac8f39930871b9037eb42a84060338024f (diff)
downloadpoky-2e1cb7917056558324143634a5dd479e70d10d55.tar.gz
libtool: Don't patch generated files
We wipe out and regenerate all configure files so there is no point in patching them. (From OE-Core rev: 8d7036cdb71e66e619053c2545cfc1fbddf1895b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch660
1 files changed, 0 insertions, 660 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
index 438c63933b..c3e3e867aa 100644
--- a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
+++ b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch
@@ -10,126 +10,6 @@ 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.2/configure
14===================================================================
15--- libtool-2.4.2.orig/configure
16+++ libtool-2.4.2/configure
17@@ -795,7 +795,7 @@ enable_static
18 with_pic
19 enable_fast_install
20 with_gnu_ld
21-with_sysroot
22+with_libtool_sysroot
23 enable_libtool_lock
24 '
25 ac_precious_vars='build_alias
26@@ -1451,7 +1451,7 @@ Optional Packages:
27 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
28 both]
29 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
30- --with-sysroot=DIR Search for dependent libraries within DIR
31+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
32 (or the compiler's sysroot if not specified).
33
34 Some influential environment variables:
35@@ -6804,29 +6804,29 @@ fi
36 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
37 $as_echo_n "checking for sysroot... " >&6; }
38
39-# Check whether --with-sysroot was given.
40-if test "${with_sysroot+set}" = set; then :
41- withval=$with_sysroot;
42+# Check whether --with-libtool-sysroot was given.
43+if test "${with_libtool_sysroot+set}" = set; then :
44+ withval=$with_libtool_sysroot;
45 else
46- with_sysroot=no
47+ with_libtool_sysroot=no
48 fi
49
50
51 lt_sysroot=
52-case ${with_sysroot} in #(
53+case ${with_libtool_sysroot} in #(
54 yes)
55 if test "$GCC" = yes; then
56 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
57 fi
58 ;; #(
59 /*)
60- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
61+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
62 ;; #(
63 no|'')
64 ;; #(
65 *)
66- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
67-$as_echo "${with_sysroot}" >&6; }
68+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
69+$as_echo "${with_libtool_sysroot}" >&6; }
70 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
71 ;;
72 esac
73Index: libtool-2.4.2/libltdl/configure
74===================================================================
75--- libtool-2.4.2.orig/libltdl/configure
76+++ libtool-2.4.2/libltdl/configure
77@@ -747,7 +747,7 @@ with_pic
78 enable_fast_install
79 enable_dependency_tracking
80 with_gnu_ld
81-with_sysroot
82+with_libtool_sysroot
83 enable_libtool_lock
84 enable_ltdl_install
85 '
86@@ -1395,7 +1395,7 @@ Optional Packages:
87 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
88 both]
89 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
90- --with-sysroot=DIR Search for dependent libraries within DIR
91+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
92 (or the compiler's sysroot if not specified).
93
94 Some influential environment variables:
95@@ -6017,29 +6017,29 @@ fi
96 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
97 $as_echo_n "checking for sysroot... " >&6; }
98
99-# Check whether --with-sysroot was given.
100-if test "${with_sysroot+set}" = set; then :
101- withval=$with_sysroot;
102+# Check whether --with-libtool-sysroot was given.
103+if test "${with_libtool_sysroot+set}" = set; then :
104+ withval=$with_libtool_sysroot;
105 else
106- with_sysroot=no
107+ with_libtool_sysroot=no
108 fi
109
110
111 lt_sysroot=
112-case ${with_sysroot} in #(
113+case ${with_libtool_sysroot} in #(
114 yes)
115 if test "$GCC" = yes; then
116 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
117 fi
118 ;; #(
119 /*)
120- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
121+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
122 ;; #(
123 no|'')
124 ;; #(
125 *)
126- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
127-$as_echo "${with_sysroot}" >&6; }
128+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
129+$as_echo "${with_libtool_sysroot}" >&6; }
130 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
131 ;;
132 esac
133Index: libtool-2.4.2/libltdl/m4/libtool.m4 13Index: libtool-2.4.2/libltdl/m4/libtool.m4
134=================================================================== 14===================================================================
135--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 15--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
@@ -168,486 +48,6 @@ Index: libtool-2.4.2/libltdl/m4/libtool.m4
168 AC_MSG_ERROR([The sysroot must be an absolute path.]) 48 AC_MSG_ERROR([The sysroot must be an absolute path.])
169 ;; 49 ;;
170 esac 50 esac
171Index: libtool-2.4.2/tests/cdemo/configure
172===================================================================
173--- libtool-2.4.2.orig/tests/cdemo/configure
174+++ libtool-2.4.2/tests/cdemo/configure
175@@ -734,7 +734,7 @@ enable_static
176 with_pic
177 enable_fast_install
178 with_gnu_ld
179-with_sysroot
180+with_libtool_sysroot
181 enable_libtool_lock
182 '
183 ac_precious_vars='build_alias
184@@ -1380,7 +1380,7 @@ Optional Packages:
185 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
186 both]
187 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
188- --with-sysroot=DIR Search for dependent libraries within DIR
189+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
190 (or the compiler's sysroot if not specified).
191
192 Some influential environment variables:
193@@ -5897,29 +5897,29 @@ fi
194 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
195 $as_echo_n "checking for sysroot... " >&6; }
196
197-# Check whether --with-sysroot was given.
198-if test "${with_sysroot+set}" = set; then :
199- withval=$with_sysroot;
200+# Check whether --with-libtool-sysroot was given.
201+if test "${with_libtool_sysroot+set}" = set; then :
202+ withval=$with_libtool_sysroot;
203 else
204- with_sysroot=no
205+ with_libtool_sysroot=no
206 fi
207
208
209 lt_sysroot=
210-case ${with_sysroot} in #(
211+case ${with_libtool_sysroot} in #(
212 yes)
213 if test "$GCC" = yes; then
214 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
215 fi
216 ;; #(
217 /*)
218- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
219+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
220 ;; #(
221 no|'')
222 ;; #(
223 *)
224- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
225-$as_echo "${with_sysroot}" >&6; }
226+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
227+$as_echo "${with_libtool_sysroot}" >&6; }
228 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
229 ;;
230 esac
231Index: libtool-2.4.2/tests/demo/configure
232===================================================================
233--- libtool-2.4.2.orig/tests/demo/configure
234+++ libtool-2.4.2/tests/demo/configure
235@@ -738,7 +738,7 @@ enable_static
236 with_pic
237 enable_fast_install
238 with_gnu_ld
239-with_sysroot
240+with_libtool_sysroot
241 enable_libtool_lock
242 '
243 ac_precious_vars='build_alias
244@@ -1384,7 +1384,7 @@ Optional Packages:
245 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
246 both]
247 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
248- --with-sysroot=DIR Search for dependent libraries within DIR
249+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
250 (or the compiler's sysroot if not specified).
251
252 Some influential environment variables:
253@@ -5895,29 +5895,29 @@ fi
254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
255 $as_echo_n "checking for sysroot... " >&6; }
256
257-# Check whether --with-sysroot was given.
258-if test "${with_sysroot+set}" = set; then :
259- withval=$with_sysroot;
260+# Check whether --with-libtool-sysroot was given.
261+if test "${with_libtool_sysroot+set}" = set; then :
262+ withval=$with_libtool_sysroot;
263 else
264- with_sysroot=no
265+ with_libtool_sysroot=no
266 fi
267
268
269 lt_sysroot=
270-case ${with_sysroot} in #(
271+case ${with_libtool_sysroot} in #(
272 yes)
273 if test "$GCC" = yes; then
274 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
275 fi
276 ;; #(
277 /*)
278- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
279+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
280 ;; #(
281 no|'')
282 ;; #(
283 *)
284- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
285-$as_echo "${with_sysroot}" >&6; }
286+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
287+$as_echo "${with_libtool_sysroot}" >&6; }
288 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
289 ;;
290 esac
291Index: libtool-2.4.2/tests/depdemo/configure
292===================================================================
293--- libtool-2.4.2.orig/tests/depdemo/configure
294+++ libtool-2.4.2/tests/depdemo/configure
295@@ -736,7 +736,7 @@ enable_static
296 with_pic
297 enable_fast_install
298 with_gnu_ld
299-with_sysroot
300+with_libtool_sysroot
301 enable_libtool_lock
302 '
303 ac_precious_vars='build_alias
304@@ -1382,7 +1382,7 @@ Optional Packages:
305 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
306 both]
307 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
308- --with-sysroot=DIR Search for dependent libraries within DIR
309+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
310 (or the compiler's sysroot if not specified).
311
312 Some influential environment variables:
313@@ -5892,29 +5892,29 @@ fi
314 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
315 $as_echo_n "checking for sysroot... " >&6; }
316
317-# Check whether --with-sysroot was given.
318-if test "${with_sysroot+set}" = set; then :
319- withval=$with_sysroot;
320+# Check whether --with-libtool-sysroot was given.
321+if test "${with_libtool_sysroot+set}" = set; then :
322+ withval=$with_libtool_sysroot;
323 else
324- with_sysroot=no
325+ with_libtool_sysroot=no
326 fi
327
328
329 lt_sysroot=
330-case ${with_sysroot} in #(
331+case ${with_libtool_sysroot} in #(
332 yes)
333 if test "$GCC" = yes; then
334 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
335 fi
336 ;; #(
337 /*)
338- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
339+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
340 ;; #(
341 no|'')
342 ;; #(
343 *)
344- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
345-$as_echo "${with_sysroot}" >&6; }
346+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
347+$as_echo "${with_libtool_sysroot}" >&6; }
348 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
349 ;;
350 esac
351Index: libtool-2.4.2/tests/f77demo/configure
352===================================================================
353--- libtool-2.4.2.orig/tests/f77demo/configure
354+++ libtool-2.4.2/tests/f77demo/configure
355@@ -738,7 +738,7 @@ enable_static
356 with_pic
357 enable_fast_install
358 with_gnu_ld
359-with_sysroot
360+with_libtool_sysroot
361 enable_libtool_lock
362 '
363 ac_precious_vars='build_alias
364@@ -1387,7 +1387,7 @@ Optional Packages:
365 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
366 both]
367 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
368- --with-sysroot=DIR Search for dependent libraries within DIR
369+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
370 (or the compiler's sysroot if not specified).
371
372 Some influential environment variables:
373@@ -6877,29 +6877,29 @@ fi
374 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
375 $as_echo_n "checking for sysroot... " >&6; }
376
377-# Check whether --with-sysroot was given.
378-if test "${with_sysroot+set}" = set; then :
379- withval=$with_sysroot;
380+# Check whether --with-libtool-sysroot was given.
381+if test "${with_libtool_sysroot+set}" = set; then :
382+ withval=$with_libtool_sysroot;
383 else
384- with_sysroot=no
385+ with_libtool_sysroot=no
386 fi
387
388
389 lt_sysroot=
390-case ${with_sysroot} in #(
391+case ${with_libtool_sysroot} in #(
392 yes)
393 if test "$GCC" = yes; then
394 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
395 fi
396 ;; #(
397 /*)
398- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
399+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
400 ;; #(
401 no|'')
402 ;; #(
403 *)
404- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
405-$as_echo "${with_sysroot}" >&6; }
406+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
407+$as_echo "${with_libtool_sysroot}" >&6; }
408 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
409 ;;
410 esac
411Index: libtool-2.4.2/tests/fcdemo/configure
412===================================================================
413--- libtool-2.4.2.orig/tests/fcdemo/configure
414+++ libtool-2.4.2/tests/fcdemo/configure
415@@ -739,7 +739,7 @@ enable_static
416 with_pic
417 enable_fast_install
418 with_gnu_ld
419-with_sysroot
420+with_libtool_sysroot
421 enable_libtool_lock
422 '
423 ac_precious_vars='build_alias
424@@ -1388,7 +1388,7 @@ Optional Packages:
425 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
426 both]
427 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
428- --with-sysroot=DIR Search for dependent libraries within DIR
429+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
430 (or the compiler's sysroot if not specified).
431
432 Some influential environment variables:
433@@ -6976,29 +6976,29 @@ fi
434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
435 $as_echo_n "checking for sysroot... " >&6; }
436
437-# Check whether --with-sysroot was given.
438-if test "${with_sysroot+set}" = set; then :
439- withval=$with_sysroot;
440+# Check whether --with-libtool-sysroot was given.
441+if test "${with_libtool_sysroot+set}" = set; then :
442+ withval=$with_libtool_sysroot;
443 else
444- with_sysroot=no
445+ with_libtool_sysroot=no
446 fi
447
448
449 lt_sysroot=
450-case ${with_sysroot} in #(
451+case ${with_libtool_sysroot} in #(
452 yes)
453 if test "$GCC" = yes; then
454 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
455 fi
456 ;; #(
457 /*)
458- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
459+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
460 ;; #(
461 no|'')
462 ;; #(
463 *)
464- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
465-$as_echo "${with_sysroot}" >&6; }
466+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
467+$as_echo "${with_libtool_sysroot}" >&6; }
468 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
469 ;;
470 esac
471Index: libtool-2.4.2/tests/mdemo/configure
472===================================================================
473--- libtool-2.4.2.orig/tests/mdemo/configure
474+++ libtool-2.4.2/tests/mdemo/configure
475@@ -742,7 +742,7 @@ enable_static
476 with_pic
477 enable_fast_install
478 with_gnu_ld
479-with_sysroot
480+with_libtool_sysroot
481 enable_libtool_lock
482 '
483 ac_precious_vars='build_alias
484@@ -1388,7 +1388,7 @@ Optional Packages:
485 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
486 both]
487 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
488- --with-sysroot=DIR Search for dependent libraries within DIR
489+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
490 (or the compiler's sysroot if not specified).
491
492 Some influential environment variables:
493@@ -5924,29 +5924,29 @@ fi
494 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
495 $as_echo_n "checking for sysroot... " >&6; }
496
497-# Check whether --with-sysroot was given.
498-if test "${with_sysroot+set}" = set; then :
499- withval=$with_sysroot;
500+# Check whether --with-libtool-sysroot was given.
501+if test "${with_libtool_sysroot+set}" = set; then :
502+ withval=$with_libtool_sysroot;
503 else
504- with_sysroot=no
505+ with_libtool_sysroot=no
506 fi
507
508
509 lt_sysroot=
510-case ${with_sysroot} in #(
511+case ${with_libtool_sysroot} in #(
512 yes)
513 if test "$GCC" = yes; then
514 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
515 fi
516 ;; #(
517 /*)
518- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
519+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
520 ;; #(
521 no|'')
522 ;; #(
523 *)
524- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
525-$as_echo "${with_sysroot}" >&6; }
526+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
527+$as_echo "${with_libtool_sysroot}" >&6; }
528 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
529 ;;
530 esac
531Index: libtool-2.4.2/tests/mdemo2/configure
532===================================================================
533--- libtool-2.4.2.orig/tests/mdemo2/configure
534+++ libtool-2.4.2/tests/mdemo2/configure
535@@ -734,7 +734,7 @@ enable_static
536 with_pic
537 enable_fast_install
538 with_gnu_ld
539-with_sysroot
540+with_libtool_sysroot
541 enable_libtool_lock
542 '
543 ac_precious_vars='build_alias
544@@ -1380,7 +1380,7 @@ Optional Packages:
545 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
546 both]
547 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
548- --with-sysroot=DIR Search for dependent libraries within DIR
549+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
550 (or the compiler's sysroot if not specified).
551
552 Some influential environment variables:
553@@ -5897,29 +5897,29 @@ fi
554 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
555 $as_echo_n "checking for sysroot... " >&6; }
556
557-# Check whether --with-sysroot was given.
558-if test "${with_sysroot+set}" = set; then :
559- withval=$with_sysroot;
560+# Check whether --with-libtool-sysroot was given.
561+if test "${with_libtool_sysroot+set}" = set; then :
562+ withval=$with_libtool_sysroot;
563 else
564- with_sysroot=no
565+ with_libtool_sysroot=no
566 fi
567
568
569 lt_sysroot=
570-case ${with_sysroot} in #(
571+case ${with_libtool_sysroot} in #(
572 yes)
573 if test "$GCC" = yes; then
574 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
575 fi
576 ;; #(
577 /*)
578- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
579+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
580 ;; #(
581 no|'')
582 ;; #(
583 *)
584- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
585-$as_echo "${with_sysroot}" >&6; }
586+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
587+$as_echo "${with_libtool_sysroot}" >&6; }
588 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
589 ;;
590 esac
591Index: libtool-2.4.2/tests/pdemo/configure
592===================================================================
593--- libtool-2.4.2.orig/tests/pdemo/configure
594+++ libtool-2.4.2/tests/pdemo/configure
595@@ -737,7 +737,7 @@ enable_static
596 with_pic
597 enable_fast_install
598 with_gnu_ld
599-with_sysroot
600+with_libtool_sysroot
601 enable_libtool_lock
602 '
603 ac_precious_vars='build_alias
604@@ -1383,7 +1383,7 @@ Optional Packages:
605 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
606 both]
607 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
608- --with-sysroot=DIR Search for dependent libraries within DIR
609+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
610 (or the compiler's sysroot if not specified).
611
612 Some influential environment variables:
613@@ -5900,29 +5900,29 @@ fi
614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
615 $as_echo_n "checking for sysroot... " >&6; }
616
617-# Check whether --with-sysroot was given.
618-if test "${with_sysroot+set}" = set; then :
619- withval=$with_sysroot;
620+# Check whether --with-libtool-sysroot was given.
621+if test "${with_libtool_sysroot+set}" = set; then :
622+ withval=$with_libtool_sysroot;
623 else
624- with_sysroot=no
625+ with_libtool_sysroot=no
626 fi
627
628
629 lt_sysroot=
630-case ${with_sysroot} in #(
631+case ${with_libtool_sysroot} in #(
632 yes)
633 if test "$GCC" = yes; then
634 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
635 fi
636 ;; #(
637 /*)
638- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
639+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
640 ;; #(
641 no|'')
642 ;; #(
643 *)
644- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
645-$as_echo "${with_sysroot}" >&6; }
646+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
647+$as_echo "${with_libtool_sysroot}" >&6; }
648 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
649 ;;
650 esac
651Index: libtool-2.4.2/tests/sysroot.at 51Index: libtool-2.4.2/tests/sysroot.at
652=================================================================== 52===================================================================
653--- libtool-2.4.2.orig/tests/sysroot.at 53--- libtool-2.4.2.orig/tests/sysroot.at
@@ -679,66 +79,6 @@ Index: libtool-2.4.2/tests/sysroot.at
679 AC_SUBST([sysroot]) 79 AC_SUBST([sysroot])
680 AC_OUTPUT(Makefile) 80 AC_OUTPUT(Makefile)
681 ]]) 81 ]])
682Index: libtool-2.4.2/tests/tagdemo/configure
683===================================================================
684--- libtool-2.4.2.orig/tests/tagdemo/configure
685+++ libtool-2.4.2/tests/tagdemo/configure
686@@ -744,7 +744,7 @@ enable_static
687 with_pic
688 enable_fast_install
689 with_gnu_ld
690-with_sysroot
691+with_libtool_sysroot
692 enable_libtool_lock
693 '
694 ac_precious_vars='build_alias
695@@ -1395,7 +1395,7 @@ Optional Packages:
696 --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
697 both]
698 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
699- --with-sysroot=DIR Search for dependent libraries within DIR
700+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR
701 (or the compiler's sysroot if not specified).
702
703 Some influential environment variables:
704@@ -6916,29 +6916,29 @@ fi
705 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
706 $as_echo_n "checking for sysroot... " >&6; }
707
708-# Check whether --with-sysroot was given.
709-if test "${with_sysroot+set}" = set; then :
710- withval=$with_sysroot;
711+# Check whether --with-libtool-sysroot was given.
712+if test "${with_libtool_sysroot+set}" = set; then :
713+ withval=$with_libtool_sysroot;
714 else
715- with_sysroot=no
716+ with_libtool_sysroot=no
717 fi
718
719
720 lt_sysroot=
721-case ${with_sysroot} in #(
722+case ${with_libtool_sysroot} in #(
723 yes)
724 if test "$GCC" = yes; then
725 lt_sysroot=`$CC --print-sysroot 2>/dev/null`
726 fi
727 ;; #(
728 /*)
729- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
730+ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
731 ;; #(
732 no|'')
733 ;; #(
734 *)
735- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
736-$as_echo "${with_sysroot}" >&6; }
737+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5
738+$as_echo "${with_libtool_sysroot}" >&6; }
739 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
740 ;;
741 esac
742Index: libtool-2.4.2/tests/testsuite 82Index: libtool-2.4.2/tests/testsuite
743=================================================================== 83===================================================================
744--- libtool-2.4.2.orig/tests/testsuite 84--- libtool-2.4.2.orig/tests/testsuite
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-28 08:05:07 +0000