42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
Upstream-Status: Pending
|
|
|
|
This patch updates libtool.m4 (and its output) to resolve a problem
|
|
with variable 'lt_sysroot' not being properly updated if the option
|
|
'--with[-libtool]-sysroot' is not provided when running the 'configure'
|
|
script for a package.
|
|
|
|
I have also reported the problem to libtool here
|
|
|
|
http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html
|
|
|
|
Signed-off-by: Hans Beckerus <hans.beckerus at gmail.com>
|
|
---
|
|
diff -ur libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
|
|
--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-09-13 22:37:43.647282945 +0200
|
|
+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-09-14 10:27:37.168178605 +0200
|
|
@@ -1234,16 +1234,21 @@
|
|
dnl in case the user passed a directory name.
|
|
lt_sysroot=
|
|
case ${with_libtool_sysroot} in #(
|
|
- yes)
|
|
+ no)
|
|
if test "$GCC" = yes; then
|
|
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
|
|
+ # Treat "/" the same a an unset sysroot. It seems to be more
|
|
+ # compatible across host platforms that way!?
|
|
+ if test "$lt_sysroot" = /; then
|
|
+ lt_sysroot=
|
|
+ fi
|
|
fi
|
|
;; #(
|
|
+ yes|''|/)
|
|
+ ;; #(
|
|
/*)
|
|
lt_sysroot=`echo "$with_libtool_sysroot" | sed -e "$sed_quote_subst"`
|
|
;; #(
|
|
- no|'')
|
|
- ;; #(
|
|
*)
|
|
AC_MSG_RESULT([${with_libtool_sysroot}])
|
|
AC_MSG_ERROR([The sysroot must be an absolute path.])
|