| From: Khem Raj <raj.khem@gmail.com> |
| Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils |
| |
| This patch renames the --with-sysroot option to --with-libtool-sysroot |
| to avoid namespace conflict with binutils, gcc and other toolchain |
| components since these componets also add that option to configure |
| and this becomes confusing and conflicting otherwise. |
| |
| Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| |
| Upstream report: |
| http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html |
| |
| Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] |
| |
| Index: libtool-2.4.7/m4/libtool.m4 |
| =================================================================== |
| --- libtool-2.4.7.orig/m4/libtool.m4 |
| +++ libtool-2.4.7/m4/libtool.m4 |
| @@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr |
| AC_DEFUN([_LT_WITH_SYSROOT], |
| [m4_require([_LT_DECL_SED])dnl |
| AC_MSG_CHECKING([for sysroot]) |
| -AC_ARG_WITH([sysroot], |
| -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], |
| +AC_ARG_WITH([libtool-sysroot], |
| +[AS_HELP_STRING([--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 yes = "$GCC"; 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.7/tests/sysroot.at |
| =================================================================== |
| --- libtool-2.4.7.orig/tests/sysroot.at |
| +++ libtool-2.4.7/tests/sysroot.at |
| @@ -65,7 +65,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 PATH = "$shlibpath_var"; then |
| @@ -115,7 +115,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) |
| ]]) |
| @@ -156,7 +156,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) |
| ]]) |
| diff --git a/tests/testsuite b/tests/testsuite |
| --- a/tests/testsuite |
| +++ b/tests/testsuite |
| @@ -48945,7 +48945,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 PATH = "$shlibpath_var"; then |
| @@ -49154,7 +49154,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 |
| @@ -49342,7 +49342,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 |
| @@ -49694,7 +49694,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 PATH = "$shlibpath_var"; then |
| @@ -49903,7 +49903,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 |
| @@ -50091,7 +50091,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 |
| @@ -50443,7 +50443,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 PATH = "$shlibpath_var"; then |
| @@ -50652,7 +50652,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 |
| @@ -50840,7 +50840,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 |