[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conf
From: |
Richard Purdie |
Subject: |
[PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils |
Date: |
Mon, 25 Oct 2021 15:33:27 +0100 |
From: Khem Raj <raj.khem@gmail.com>
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>
---
m4/libtool.m4 | 12 ++++++------
tests/sysroot.at | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f2d1f398..de2f1ebf 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1246,28 +1246,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that
protects backslashes])
# ----------------
AC_DEFUN([_LT_WITH_SYSROOT],
[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
diff --git a/tests/sysroot.at b/tests/sysroot.at
index 05faa13d..7a1f9567 100644
--- a/tests/sysroot.at
+++ b/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 PATH = "$shlibpath_var"; 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)
]])
--
2.25.1
- [PATCH 00/12] Yocto Project libtool patch queue, Richard Purdie, 2021/10/25
- [PATCH 04/12] ltmain.sh: Fix sysroot paths being encoded into RPATHs, Richard Purdie, 2021/10/25
- [PATCH 01/12] ltmain.in: Handle trailing slashes on install commands correctly, Richard Purdie, 2021/10/25
- [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script, Richard Purdie, 2021/10/25
- [PATCH 05/12] ltmain.in: Don't encode RATHS which match default linker paths, Richard Purdie, 2021/10/25
- [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils,
Richard Purdie <=
- [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf, Richard Purdie, 2021/10/25
- [PATCH 08/12] libtool: Check for static libs for internal compiler libraries, Richard Purdie, 2021/10/25
- [PATCH 03/12] ltmain.in: Add missing sysroot to library path, Richard Purdie, 2021/10/25
- [PATCH 06/12] libtool.m4: Handle "/" as a sysroot correctly, Richard Purdie, 2021/10/25
- [PATCH 11/12] ltmain.in: Handle prefix-map compiler options correctly, Richard Purdie, 2021/10/25
- [PATCH 10/12] Makefile.am: make sure autoheader run before automake, Richard Purdie, 2021/10/25
- [PATCH 07/12] libtool: Fix support for NIOS2 processor, Richard Purdie, 2021/10/25