diff options
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | 194 |
1 files changed, 97 insertions, 97 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch b/meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch index 9c8696b453..438c63933b 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 | ||
13 | Index: libtool-2.4/configure | 13 | Index: 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 |
73 | Index: libtool-2.4/libltdl/configure | 73 | Index: 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 |
133 | Index: libtool-2.4/libltdl/m4/libtool.m4 | 133 | Index: 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 |
171 | Index: libtool-2.4/tests/cdemo/configure | 171 | Index: 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 |
231 | Index: libtool-2.4/tests/demo/configure | 231 | Index: 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 |
291 | Index: libtool-2.4/tests/depdemo/configure | 291 | Index: 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 |
351 | Index: libtool-2.4/tests/f77demo/configure | 351 | Index: 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 |
411 | Index: libtool-2.4/tests/fcdemo/configure | 411 | Index: 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 |
471 | Index: libtool-2.4/tests/mdemo/configure | 471 | Index: 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 |
531 | Index: libtool-2.4/tests/mdemo2/configure | 531 | Index: 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 |
591 | Index: libtool-2.4/tests/pdemo/configure | 591 | Index: 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 |
651 | Index: libtool-2.4/tests/sysroot.at | 651 | Index: 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 | ]]) |
682 | Index: libtool-2.4/tests/tagdemo/configure | 682 | Index: 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 |
742 | Index: libtool-2.4/tests/testsuite | 742 | Index: 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 |