libtool: Don't patch generated files
We wipe out and regenerate all configure files so there is no point in patching them. (From OE-Core rev: 8d7036cdb71e66e619053c2545cfc1fbddf1895b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
parent
08d902ac8f
commit
2e1cb79170
|
|
@ -10,126 +10,6 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
|
|||
|
||||
-Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Index: libtool-2.4.2/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/configure
|
||||
+++ libtool-2.4.2/configure
|
||||
@@ -795,7 +795,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1451,7 +1451,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -6804,29 +6804,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.2/libltdl/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/libltdl/configure
|
||||
+++ libtool-2.4.2/libltdl/configure
|
||||
@@ -747,7 +747,7 @@ with_pic
|
||||
enable_fast_install
|
||||
enable_dependency_tracking
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
enable_ltdl_install
|
||||
'
|
||||
@@ -1395,7 +1395,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -6017,29 +6017,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.2/libltdl/m4/libtool.m4
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/libltdl/m4/libtool.m4
|
||||
|
|
@ -168,486 +48,6 @@ Index: libtool-2.4.2/libltdl/m4/libtool.m4
|
|||
AC_MSG_ERROR([The sysroot must be an absolute path.])
|
||||
;;
|
||||
esac
|
||||
Index: libtool-2.4.2/tests/cdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/cdemo/configure
|
||||
+++ libtool-2.4.2/tests/cdemo/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
|
||||
@@ -1380,7 +1380,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -5897,29 +5897,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.2/tests/demo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/demo/configure
|
||||
+++ libtool-2.4.2/tests/demo/configure
|
||||
@@ -738,7 +738,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1384,7 +1384,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -5895,29 +5895,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.2/tests/depdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/depdemo/configure
|
||||
+++ libtool-2.4.2/tests/depdemo/configure
|
||||
@@ -736,7 +736,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[=PKGS] 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:
|
||||
@@ -5892,29 +5892,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.2/tests/f77demo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/f77demo/configure
|
||||
+++ libtool-2.4.2/tests/f77demo/configure
|
||||
@@ -738,7 +738,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1387,7 +1387,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -6877,29 +6877,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.2/tests/fcdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/fcdemo/configure
|
||||
+++ libtool-2.4.2/tests/fcdemo/configure
|
||||
@@ -739,7 +739,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1388,7 +1388,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -6976,29 +6976,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.2/tests/mdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/mdemo/configure
|
||||
+++ libtool-2.4.2/tests/mdemo/configure
|
||||
@@ -742,7 +742,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1388,7 +1388,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -5924,29 +5924,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.2/tests/mdemo2/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/mdemo2/configure
|
||||
+++ libtool-2.4.2/tests/mdemo2/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
|
||||
@@ -1380,7 +1380,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -5897,29 +5897,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.2/tests/pdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/pdemo/configure
|
||||
+++ libtool-2.4.2/tests/pdemo/configure
|
||||
@@ -737,7 +737,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[=PKGS] 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:
|
||||
@@ -5900,29 +5900,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.2/tests/sysroot.at
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/sysroot.at
|
||||
|
|
@ -679,66 +79,6 @@ Index: libtool-2.4.2/tests/sysroot.at
|
|||
AC_SUBST([sysroot])
|
||||
AC_OUTPUT(Makefile)
|
||||
]])
|
||||
Index: libtool-2.4.2/tests/tagdemo/configure
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/tagdemo/configure
|
||||
+++ libtool-2.4.2/tests/tagdemo/configure
|
||||
@@ -744,7 +744,7 @@ enable_static
|
||||
with_pic
|
||||
enable_fast_install
|
||||
with_gnu_ld
|
||||
-with_sysroot
|
||||
+with_libtool_sysroot
|
||||
enable_libtool_lock
|
||||
'
|
||||
ac_precious_vars='build_alias
|
||||
@@ -1395,7 +1395,7 @@ Optional Packages:
|
||||
--with-pic[=PKGS] 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:
|
||||
@@ -6916,29 +6916,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.2/tests/testsuite
|
||||
===================================================================
|
||||
--- libtool-2.4.2.orig/tests/testsuite
|
||||
|
|
|
|||
Loading…
Reference in New Issue