167 lines
4.7 KiB
Diff
167 lines
4.7 KiB
Diff
Upstream-Status: Pending
|
|
|
|
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.2/libltdl/m4/libtool.m4
|
|
===================================================================
|
|
--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
|
|
+++ libtool-2.4.2/libltdl/m4/libtool.m4
|
|
@@ -1224,27 +1224,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.2/tests/sysroot.at
|
|
===================================================================
|
|
--- libtool-2.4.2.orig/tests/sysroot.at
|
|
+++ libtool-2.4.2/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.2/tests/testsuite
|
|
===================================================================
|
|
--- libtool-2.4.2.orig/tests/testsuite
|
|
+++ libtool-2.4.2/tests/testsuite
|
|
@@ -26676,7 +26676,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
|
|
@@ -26874,7 +26874,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
|
|
@@ -27051,7 +27051,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
|
|
@@ -27392,7 +27392,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
|
|
@@ -27590,7 +27590,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
|
|
@@ -27767,7 +27767,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
|
|
@@ -28108,7 +28108,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
|
|
@@ -28306,7 +28306,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
|
|
@@ -28483,7 +28483,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
|