diff options
author | Scott Garman <scott.a.garman@intel.com> | 2010-12-21 10:46:15 -0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-21 01:36:14 -0800 |
commit | 62dc23953d87babc69a7fbf4b0bd61d093577167 (patch) | |
tree | d0b11895e9d797bf3363a9965f0a06894975206c /meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | |
parent | 66988ee0a236165e940fe9c6609f37f8a3491d9f (diff) | |
download | openembedded-core-contrib-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/recipes-devtools/libtool/libtool/rename-with-sysroot.patch')
-rw-r--r-- | meta/recipes-devtools/libtool/libtool/rename-with-sysroot.patch | 824 |
1 files changed, 824 insertions, 0 deletions
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 @@ +This patch renames the --with-sysroot option to --with-libtool-sysroot +to avoid namespace conflict with binutils, gcc and other toolchain +components. + +I also reported the problem to libtool here + +http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html + +-Khem Raj <raj.khem@gmail.com> + +Index: libtool-2.4/configure +=================================================================== +--- libtool-2.4.orig/configure ++++ libtool-2.4/configure +@@ -786,7 +786,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + with_gnu_ld + ' +@@ -1451,7 +1451,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -6798,29 +6798,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/libltdl/configure +=================================================================== +--- libtool-2.4.orig/libltdl/configure ++++ libtool-2.4/libltdl/configure +@@ -739,7 +739,7 @@ with_pic + enable_fast_install + enable_dependency_tracking + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + enable_ltdl_install + ' +@@ -1388,7 +1388,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -6004,29 +6004,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/libltdl/m4/libtool.m4 +=================================================================== +--- libtool-2.4.orig/libltdl/m4/libtool.m4 ++++ libtool-2.4/libltdl/m4/libtool.m4 +@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr + # ---------------- + AC_DEFUN([_LT_WITH_SYSROOT], + [AC_MSG_CHECKING([for sysroot]) +-AC_ARG_WITH([sysroot], +-[ --with-sysroot[=DIR] Search for dependent libraries within DIR ++AC_ARG_WITH([libtool-sysroot], ++[ --with-libtool-sysroot[=DIR] Search for dependent libraries within DIR + (or the compiler's sysroot if not specified).], +-[], [with_sysroot=no]) ++[], [with_libtool_sysroot=no]) + + dnl lt_sysroot will always be passed unquoted. We quote it here + dnl in case the user passed a directory name. + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- AC_MSG_RESULT([${with_sysroot}]) ++ AC_MSG_RESULT([${with_libtool_sysroot}]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) + ;; + esac +Index: libtool-2.4/tests/cdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/cdemo/configure ++++ libtool-2.4/tests/cdemo/configure +@@ -726,7 +726,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1373,7 +1373,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5884,29 +5884,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/demo/configure +=================================================================== +--- libtool-2.4.orig/tests/demo/configure ++++ libtool-2.4/tests/demo/configure +@@ -730,7 +730,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1377,7 +1377,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5882,29 +5882,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/depdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/depdemo/configure ++++ libtool-2.4/tests/depdemo/configure +@@ -728,7 +728,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1375,7 +1375,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5879,29 +5879,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/f77demo/configure +=================================================================== +--- libtool-2.4.orig/tests/f77demo/configure ++++ libtool-2.4/tests/f77demo/configure +@@ -730,7 +730,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1382,7 +1382,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -6864,29 +6864,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/fcdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/fcdemo/configure ++++ libtool-2.4/tests/fcdemo/configure +@@ -731,7 +731,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1383,7 +1383,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -6963,29 +6963,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/mdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/mdemo/configure ++++ libtool-2.4/tests/mdemo/configure +@@ -734,7 +734,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1381,7 +1381,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5911,29 +5911,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/mdemo2/configure +=================================================================== +--- libtool-2.4.orig/tests/mdemo2/configure ++++ libtool-2.4/tests/mdemo2/configure +@@ -726,7 +726,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1373,7 +1373,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5884,29 +5884,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/pdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/pdemo/configure ++++ libtool-2.4/tests/pdemo/configure +@@ -729,7 +729,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + ' + ac_precious_vars='build_alias +@@ -1376,7 +1376,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -5887,29 +5887,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/sysroot.at +=================================================================== +--- libtool-2.4.orig/tests/sysroot.at ++++ libtool-2.4/tests/sysroot.at +@@ -64,7 +64,7 @@ while read file; do + done]) + + LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" +-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" ++configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" + + #??? + if test "$shlibpath_var" = PATH; then +@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([lib2.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + ]]) +@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([prog.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + ]]) +Index: libtool-2.4/tests/tagdemo/configure +=================================================================== +--- libtool-2.4.orig/tests/tagdemo/configure ++++ libtool-2.4/tests/tagdemo/configure +@@ -736,7 +736,7 @@ enable_static + with_pic + enable_fast_install + with_gnu_ld +-with_sysroot ++with_libtool_sysroot + enable_libtool_lock + with_gnu_ld + ' +@@ -1392,7 +1392,7 @@ Optional Packages: + --with-pic try to use only PIC/non-PIC objects [default=use + both] + --with-gnu-ld assume the C compiler uses GNU ld [default=no] +- --with-sysroot=DIR Search for dependent libraries within DIR ++ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + (or the compiler's sysroot if not specified). + + Some influential environment variables: +@@ -6907,29 +6907,29 @@ fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 + $as_echo_n "checking for sysroot... " >&6; } + +-# Check whether --with-sysroot was given. +-if test "${with_sysroot+set}" = set; then : +- withval=$with_sysroot; ++# Check whether --with-libtool-sysroot was given. ++if test "${with_libtool_sysroot+set}" = set; then : ++ withval=$with_libtool_sysroot; + else +- with_sysroot=no ++ with_libtool_sysroot=no + fi + + + lt_sysroot= +-case ${with_sysroot} in #( ++case ${with_libtool_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) +- lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` ++ lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +-$as_echo "${with_sysroot}" >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 ++$as_echo "${with_libtool_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; + esac +Index: libtool-2.4/tests/testsuite +=================================================================== +--- libtool-2.4.orig/tests/testsuite ++++ libtool-2.4/tests/testsuite +@@ -25277,7 +25277,7 @@ $at_traceon; } + + + LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" +-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" ++configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" + + #??? + if test "$shlibpath_var" = PATH; then +@@ -25475,7 +25475,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([lib2.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF +@@ -25652,7 +25652,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([prog.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF +@@ -25993,7 +25993,7 @@ $at_traceon; } + + + LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" +-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" ++configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" + + #??? + if test "$shlibpath_var" = PATH; then +@@ -26191,7 +26191,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([lib2.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF +@@ -26368,7 +26368,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([prog.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF +@@ -26709,7 +26709,7 @@ $at_traceon; } + + + LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" +-configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" ++configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" + + #??? + if test "$shlibpath_var" = PATH; then +@@ -26907,7 +26907,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([lib2.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF +@@ -27084,7 +27084,7 @@ AM_INIT_AUTOMAKE([foreign]) + AC_PROG_CC + AC_CONFIG_SRCDIR([prog.c]) + LT_INIT +-sysroot=$with_sysroot ++sysroot=$with_libtool_sysroot + AC_SUBST([sysroot]) + AC_OUTPUT(Makefile) + _ATEOF |