From ece98763f4bd2f4dbbee93417a04462533651c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 20 Oct 2015 14:07:40 +0200 Subject: [PATCH] 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. --- srcpkgs/gmp/template | 6 +- srcpkgs/libarchive/template | 6 +- .../libtool/patches/0001-trailingslash.patch | 53 ++ .../libtool/patches/0001-tralingslash.patch | 30 - .../patches/0002-rename-with-sysroot.patch | 806 ++++-------------- .../patches/0004-use-sysroot-in-libpath.patch | 11 +- srcpkgs/libtool/template | 10 +- 7 files changed, 217 insertions(+), 705 deletions(-) create mode 100644 srcpkgs/libtool/patches/0001-trailingslash.patch delete mode 100644 srcpkgs/libtool/patches/0001-tralingslash.patch diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template index d98579d645f..db8c82538fc 100644 --- a/srcpkgs/gmp/template +++ b/srcpkgs/gmp/template @@ -1,7 +1,7 @@ # Template build file for 'gmp' pkgname=gmp version=6.0.0 -revision=3 +revision=4 bootstrap=yes build_style=gnu-configure configure_args="--enable-cxx" @@ -17,9 +17,9 @@ checksum=9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764 subpackages="gmpxx gmpxx-devel gmp-devel" if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" libtool" + hostmakedepends+=" automake libtool" pre_configure() { - libtoolize -f + autoreconf -if } fi diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 56467690e5d..706a9f0fa4e 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.1.2 -revision=18 +revision=19 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) @@ -18,9 +18,9 @@ distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz" checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e if [ "$CROSS_BUILD" ]; then - hostmakedepends="libtool" + hostmakedepends="automake libtool" pre_configure() { - libtoolize -f + autoreconf -if } fi diff --git a/srcpkgs/libtool/patches/0001-trailingslash.patch b/srcpkgs/libtool/patches/0001-trailingslash.patch new file mode 100644 index 00000000000..11cebfad3c2 --- /dev/null +++ b/srcpkgs/libtool/patches/0001-trailingslash.patch @@ -0,0 +1,53 @@ +A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c \ + gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio) + +This is because libdir has a trailing slash which breaks the comparision. + +RP 2/1/10 + +Merged a patch received from Gary Thomas + +Date: 2010/07/12 +Nitin A Kamble + +Adapted to libtool-2.4.6 file build-aux/ltmain.in +Jürgen Buchmüller + +--- build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 ++++ build-aux/ltmain.in 2015-10-20 13:35:03.265959290 +0200 +@@ -2363,8 +2363,15 @@ + func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that +--- build-aux/ltmain.sh 2015-02-15 17:15:12.000000000 +0100 ++++ build-aux/ltmain.sh 2015-10-20 23:26:41.674142100 +0200 +@@ -4275,8 +4275,15 @@ + func_append dir "$objdir" + + if test -n "$relink_command"; then ++ # Strip any trailing slash from the destination. ++ func_stripname '' '/' "$libdir" ++ destlibdir=$func_stripname_result ++ ++ func_stripname '' '/' "$destdir" ++ s_destdir=$func_stripname_result ++ + # Determine the prefix the user has applied to our future dir. +- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` ++ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that diff --git a/srcpkgs/libtool/patches/0001-tralingslash.patch b/srcpkgs/libtool/patches/0001-tralingslash.patch deleted file mode 100644 index 787316fa72a..00000000000 --- a/srcpkgs/libtool/patches/0001-tralingslash.patch +++ /dev/null @@ -1,30 +0,0 @@ -A command like /bin/sh ../../i586-poky-linux-libtool --mode=install /usr/bin/install -c gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio) - -This is because libdir has a trailing slash which breaks the comparision. - -RP 2/1/10 - -Merged a patch received from Gary Thomas - -Date: 2010/07/12 -Nitin A Kamble - ---- libltdl/config/ltmain.m4sh -+++ libltdl/config/ltmain.m4sh -@@ -1634,8 +1634,15 @@ func_mode_install () - dir="$dir$objdir" - - if test -n "$relink_command"; then -+ # Strip any trailing slash from the destination. -+ func_stripname '' '/' "$libdir" -+ destlibdir=$func_stripname_result -+ -+ func_stripname '' '/' "$destdir" -+ s_destdir=$func_stripname_result -+ - # Determine the prefix the user has applied to our future dir. -- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` -+ inst_prefix_dir=`$ECHO "X$s_destdir" | $Xsed -e "s%$destlibdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that diff --git a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch index 221b2f84f58..4a6048ca6f9 100644 --- a/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch +++ b/srcpkgs/libtool/patches/0002-rename-with-sysroot.patch @@ -8,27 +8,31 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html -Khem Raj ---- configure -+++ configure -@@ -786,7 +786,7 @@ enable_static - with_pic +Adapted to libtool-2.4.6 configure files and line numbers +Jürgen Buchmüller + +--- 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 - with_gnu_ld ' -@@ -1451,7 +1451,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] + 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 -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). +- --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: -@@ -6798,29 +6798,29 @@ fi +@@ -7389,29 +7390,29 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -45,10 +49,10 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html lt_sysroot= --case ${with_sysroot} in #( -+case ${with_libtool_sysroot} in #( +-case $with_sysroot in #( ++case $with_libtool_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -59,17 +63,17 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html 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_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 -+++ libltdl/configure -@@ -739,7 +739,7 @@ with_pic - enable_fast_install +--- 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 @@ -77,16 +81,17 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html enable_libtool_lock enable_ltdl_install ' -@@ -1388,7 +1388,7 @@ Optional Packages: - --with-pic try to use only PIC/non-PIC objects [default=use - both] +@@ -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 -+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). +- --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: -@@ -6004,29 +6004,29 @@ fi +@@ -6275,29 +6276,29 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -103,10 +108,10 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html lt_sysroot= --case ${with_sysroot} in #( -+case ${with_libtool_sysroot} in #( +-case $with_sysroot in #( ++case $with_libtool_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -117,516 +122,99 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html 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_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/m4/libtool.m4 -+++ libltdl/m4/libtool.m4 -@@ -1180,27 +1180,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 ---- tests/cdemo/configure -+++ tests/cdemo/configure -@@ -726,7 +726,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - ' - ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic 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: -@@ -5884,29 +5884,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 +--- tests/testsuite 2015-02-15 17:15:25.000000000 +0100 ++++ tests/testsuite 2015-10-20 14:29:41.455253215 +0200 +@@ -49296,7 +49296,7 @@ - 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 ---- tests/demo/configure -+++ tests/demo/configure -@@ -730,7 +730,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - ' - ac_precious_vars='build_alias -@@ -1377,7 +1377,7 @@ Optional Packages: - --with-pic 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). + 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" - Some influential environment variables: -@@ -5882,29 +5882,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 + #??? + 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 @@ - 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 ---- tests/depdemo/configure -+++ tests/depdemo/configure -@@ -728,7 +728,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - ' - ac_precious_vars='build_alias -@@ -1375,7 +1375,7 @@ Optional Packages: - --with-pic 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). + 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" - Some influential environment variables: -@@ -5879,29 +5879,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 + #??? + 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 @@ - 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 ---- tests/f77demo/configure -+++ tests/f77demo/configure -@@ -730,7 +730,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 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). + 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" - Some influential environment variables: -@@ -6864,29 +6864,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 ---- tests/fcdemo/configure -+++ tests/fcdemo/configure -@@ -731,7 +731,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 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: -@@ -6963,29 +6963,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 ---- tests/mdemo/configure -+++ tests/mdemo/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 -@@ -1381,7 +1381,7 @@ Optional Packages: - --with-pic 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: -@@ -5911,29 +5911,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 ---- tests/mdemo2/configure -+++ tests/mdemo2/configure -@@ -726,7 +726,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - ' - ac_precious_vars='build_alias -@@ -1373,7 +1373,7 @@ Optional Packages: - --with-pic 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: -@@ -5884,29 +5884,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 ---- tests/pdemo/configure -+++ tests/pdemo/configure -@@ -729,7 +729,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - ' - ac_precious_vars='build_alias -@@ -1376,7 +1376,7 @@ Optional Packages: - --with-pic 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: -@@ -5887,29 +5887,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 ---- tests/sysroot.at -+++ tests/sysroot.at -@@ -64,7 +64,7 @@ while read file; do + #??? + 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" @@ -634,8 +222,8 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" #??? - if test "$shlibpath_var" = PATH; then -@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) + if test PATH = "$shlibpath_var"; then +@@ -114,7 +114,7 @@ AC_PROG_CC AC_CONFIG_SRCDIR([lib2.c]) LT_INIT @@ -644,7 +232,7 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) -@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign]) +@@ -155,7 +155,7 @@ AC_PROG_CC AC_CONFIG_SRCDIR([prog.c]) LT_INIT @@ -653,47 +241,30 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html AC_SUBST([sysroot]) AC_OUTPUT(Makefile) ]]) ---- tests/tagdemo/configure -+++ tests/tagdemo/configure -@@ -736,7 +736,7 @@ enable_static - with_pic - enable_fast_install - with_gnu_ld --with_sysroot -+with_libtool_sysroot - enable_libtool_lock - with_gnu_ld - ' -@@ -1392,7 +1392,7 @@ Optional Packages: - --with-pic 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: -@@ -6907,29 +6907,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 - +--- 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 #( +-case $with_sysroot in #( ++case $with_libtool_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -704,93 +275,8 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html 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 +- AC_MSG_RESULT([$with_sysroot]) ++ AC_MSG_RESULT([$with_libtool_sysroot]) + AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac ---- tests/testsuite -+++ tests/testsuite -@@ -25277,7 +25277,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 -@@ -25475,7 +25475,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 -@@ -25652,7 +25652,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 -@@ -25993,7 +25993,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 -@@ -26191,7 +26191,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 -@@ -26368,7 +26368,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 -@@ -26709,7 +26709,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 -@@ -26907,7 +26907,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 -@@ -27084,7 +27084,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 diff --git a/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch b/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch index 28e48769b91..78f37b880df 100644 --- a/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch +++ b/srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch @@ -5,13 +5,16 @@ i.e. when lt_sysroot is not set, it will still behave the same and add -Khem Raj ---- libltdl/config/ltmain.m4sh -+++ libltdl/config/ltmain.m4sh -@@ -6122,7 +6122,7 @@ func_mode_link () +Adapted to libtool-2.4.6 build-aux/ltmain.in +Jürgen Buchmüller + +--- build-aux/ltmain.in 2015-02-06 13:57:56.000000000 +0100 ++++ build-aux/ltmain.in 2015-10-20 13:40:29.959988582 +0200 +@@ -6456,7 +6456,7 @@ fi else # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" +- add_dir=-L$libdir + add_dir="-L$lt_sysroot$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template index 0f637bd3e80..89377762047 100644 --- a/srcpkgs/libtool/template +++ b/srcpkgs/libtool/template @@ -1,19 +1,19 @@ # Template build file for 'libtool' pkgname=libtool -version=2.4.2 -revision=13 +version=2.4.6 +revision=1 hostmakedepends="perl automake help2man" depends="tar sed" build_style=gnu-configure homepage="http://www.gnu.org/software/libtool" -distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz" +distfiles="${GNU_SITE}/libtool/$pkgname-$version.tar.xz" short_desc="Generic library support script" maintainer="Juan RP " license="GPL-2" -checksum=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407 +checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f pre_configure() { - ./bootstrap + ./bootstrap --force } libltdl-devel_package() {