void-packages/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch
Jürgen Buchmüller ece98763f4 libtool: update to 2.4.6
I adapted the patches to enable cross compiling to the
new file hierarchy and line numbers:
+ configure and libltdl/configure have just different line numbers
+ libltdl/config/ltmain.m4sh was replaced with build-aux/ltmain.{in,sh}
+ tests/cdemo does no longer exist
+ patched tests/testsuite and tests/sysroot.at instead
+ had to add --force to ./bootstrap

+ gmp now needs to run autoreconf -if for cross compile case
+ libarchive -"-

I successfully built for x86_64 and cross built for armv[67]hf e.g.
`alsa-lib` for a test. However, this pr needs to be scrutinized before merge.
2015-10-21 12:00:49 +02:00

282 lines
8.1 KiB
Diff

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>
Adapted to libtool-2.4.6 configure files and line numbers
Jürgen Buchmüller <pullmoll@t-online.de>
--- configure 2015-02-15 17:14:34.000000000 +0100
+++ configure 2015-10-20 13:25:12.684906339 +0200
@@ -824,7 +824,7 @@
enable_fast_install
with_aix_soname
with_gnu_ld
-with_sysroot
+with_libtool_sysroot
enable_libtool_lock
'
ac_precious_vars='build_alias
@@ -1487,7 +1487,8 @@
shared library versioning (aka "SONAME") variant to
provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ --with-libtool-sysroot[=DIR]
+ Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
Some influential environment variables:
@@ -7389,29 +7390,29 @@
{ $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 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|'')
;; #(
*)
- { $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
--- libltdl/configure 2015-02-15 17:15:15.000000000 +0100
+++ libltdl/configure 2015-10-20 13:26:45.747914683 +0200
@@ -775,7 +775,7 @@
with_aix_soname
enable_dependency_tracking
with_gnu_ld
-with_sysroot
+with_libtool_sysroot
enable_libtool_lock
enable_ltdl_install
'
@@ -1429,7 +1429,8 @@
shared library versioning (aka "SONAME") variant to
provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ --with-libtool-sysroot[=DIR]
+ Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
Some influential environment variables:
@@ -6275,29 +6276,29 @@
{ $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 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|'')
;; #(
*)
- { $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
--- tests/testsuite 2015-02-15 17:15:25.000000000 +0100
+++ tests/testsuite 2015-10-20 14:29:41.455253215 +0200
@@ -49296,7 +49296,7 @@
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
@@ -49510,7 +49510,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -49703,7 +49703,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50060,7 +50060,7 @@
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
@@ -50274,7 +50274,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50467,7 +50467,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50824,7 +50824,7 @@
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
@@ -51038,7 +51038,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -51231,7 +51231,7 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
--- tests/sysroot.at 2015-01-16 19:52:04.000000000 +0100
+++ tests/sysroot.at 2015-10-20 14:29:57.731254674 +0200
@@ -64,7 +64,7 @@
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 @@
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 @@
AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c])
LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
]])
--- m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100
+++ m4/libtool.m4 2015-10-20 15:40:04.020631813 +0200
@@ -1245,29 +1245,29 @@
# _LT_WITH_SYSROOT
# ----------------
AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+[AC_MSG_CHECKING([for libtool-sysroot])
+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