wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-07 23:53:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

libtool: update to 2.4.6

Browse source 
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.
This commit is contained in:
Jürgen Buchmüller 2015-10-20 14:07:40 +02:00
parent 2851d07c3e
commit ece98763f4
7 changed files with 217 additions and 705 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/gmp/template
View file

@ -1,7 +1,7 @@
# Template build file for 'gmp' # Template build file for 'gmp'
pkgname=gmp pkgname=gmp
version=6.0.0 version=6.0.0
revision=3 revision=4
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--enable-cxx" configure_args="--enable-cxx"
@ -17,9 +17,9 @@ checksum=9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764
subpackages="gmpxx gmpxx-devel gmp-devel" subpackages="gmpxx gmpxx-devel gmp-devel"
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" libtool" hostmakedepends+=" automake libtool"
pre_configure() { pre_configure() {
libtoolize -f autoreconf -if
} }
fi fi

6
srcpkgs/libarchive/template
View file

@ -1,7 +1,7 @@
# Template file for 'libarchive' # Template file for 'libarchive'
pkgname=libarchive pkgname=libarchive
version=3.1.2 version=3.1.2
revision=18 revision=19
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) 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 checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
hostmakedepends="libtool" hostmakedepends="automake libtool"
pre_configure() { pre_configure() {
libtoolize -f autoreconf -if
} }
fi fi

53
srcpkgs/libtool/patches/0001-trailingslash.patch Normal file
View file

@ -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 <gary@mlbassoc.com>
Date: 2010/07/12
Nitin A Kamble <nitin.a.kamble@intel.com>
Adapted to libtool-2.4.6 file build-aux/ltmain.in
Jürgen Buchmüller <pullmoll@t-online.de>
--- 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

30
srcpkgs/libtool/patches/0001-tralingslash.patch
View file

@ -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 <gary@mlbassoc.com>
Date: 2010/07/12
Nitin A Kamble <nitin.a.kamble@intel.com>
--- 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

806
srcpkgs/libtool/patches/0002-rename-with-sysroot.patch
View file

@ -8,27 +8,31 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
-Khem Raj <raj.khem@gmail.com> -Khem Raj <raj.khem@gmail.com>
--- configure Adapted to libtool-2.4.6 configure files and line numbers
+++ configure Jürgen Buchmüller <pullmoll@t-online.de>
@@ -786,7 +786,7 @@ enable_static
with_pic --- 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 enable_fast_install
with_aix_soname
with_gnu_ld with_gnu_ld
-with_sysroot -with_sysroot
+with_libtool_sysroot +with_libtool_sysroot
enable_libtool_lock enable_libtool_lock
with_gnu_ld
' '
@@ -1451,7 +1451,7 @@ Optional Packages: ac_precious_vars='build_alias
--with-pic try to use only PIC/non-PIC objects [default=use @@ -1487,7 +1487,8 @@
both] 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-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR - --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + --with-libtool-sysroot[=DIR]
(or the compiler's sysroot if not specified). + Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
Some influential environment variables: 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 "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; } $as_echo_n "checking for sysroot... " >&6; }
@ -45,10 +49,10 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
lt_sysroot= lt_sysroot=
-case ${with_sysroot} in #( -case $with_sysroot in #(
+case ${with_libtool_sysroot} in #( +case $with_libtool_sysroot in #(
yes) yes)
if test "$GCC" = yes; then if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null` lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi fi
;; #( ;; #(
@ -59,17 +63,17 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
no|'') no|'')
;; #( ;; #(
*) *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "${with_sysroot}" >&6; } -$as_echo "$with_sysroot" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libtool_sysroot" >&5
+$as_echo "${with_libtool_sysroot}" >&6; } +$as_echo "$with_libtool_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;; ;;
esac esac
--- libltdl/configure --- libltdl/configure 2015-02-15 17:15:15.000000000 +0100
+++ libltdl/configure +++ libltdl/configure 2015-10-20 13:26:45.747914683 +0200
@@ -739,7 +739,7 @@ with_pic @@ -775,7 +775,7 @@
enable_fast_install with_aix_soname
enable_dependency_tracking enable_dependency_tracking
with_gnu_ld with_gnu_ld
-with_sysroot -with_sysroot
@ -77,16 +81,17 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
enable_libtool_lock enable_libtool_lock
enable_ltdl_install enable_ltdl_install
' '
@@ -1388,7 +1388,7 @@ Optional Packages: @@ -1429,7 +1429,8 @@
--with-pic try to use only PIC/non-PIC objects [default=use shared library versioning (aka "SONAME") variant to
both] provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-sysroot=DIR Search for dependent libraries within DIR - --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
+ --with-libtool-sysroot=DIR Search for dependent libraries within DIR + --with-libtool-sysroot[=DIR]
(or the compiler's sysroot if not specified). + Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
Some influential environment variables: 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 "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
$as_echo_n "checking for sysroot... " >&6; } $as_echo_n "checking for sysroot... " >&6; }
@ -103,10 +108,10 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
lt_sysroot= lt_sysroot=
-case ${with_sysroot} in #( -case $with_sysroot in #(
+case ${with_libtool_sysroot} in #( +case $with_libtool_sysroot in #(
yes) yes)
if test "$GCC" = yes; then if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null` lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi fi
;; #( ;; #(
@ -117,516 +122,99 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
no|'') no|'')
;; #( ;; #(
*) *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
-$as_echo "${with_sysroot}" >&6; } -$as_echo "$with_sysroot" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libtool_sysroot" >&5
+$as_echo "${with_libtool_sysroot}" >&6; } +$as_echo "$with_libtool_sysroot" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;; ;;
esac esac
--- libltdl/m4/libtool.m4 --- tests/testsuite 2015-02-15 17:15:25.000000000 +0100
+++ libltdl/m4/libtool.m4 +++ tests/testsuite 2015-10-20 14:29:41.455253215 +0200
@@ -1180,27 +1180,27 @@ _LT_DECL([], [ECHO], [1], [An echo progr @@ -49296,7 +49296,7 @@
# ----------------
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
lt_sysroot= LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-case ${with_sysroot} in #( -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+case ${with_libtool_sysroot} in #( +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
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).
Some influential environment variables: #???
@@ -5882,29 +5882,29 @@ fi if test PATH = "$shlibpath_var"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 @@ -49510,7 +49510,7 @@
$as_echo_n "checking for sysroot... " >&6; } AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
-# Check whether --with-sysroot was given. LT_INIT
-if test "${with_sysroot+set}" = set; then : -sysroot=$with_sysroot
- withval=$with_sysroot; +sysroot=$with_libtool_sysroot
+# Check whether --with-libtool-sysroot was given. AC_SUBST([sysroot])
+if test "${with_libtool_sysroot+set}" = set; then : AC_OUTPUT(Makefile)
+ withval=$with_libtool_sysroot; _ATEOF
else @@ -49703,7 +49703,7 @@
- with_sysroot=no AC_PROG_CC
+ with_libtool_sysroot=no AC_CONFIG_SRCDIR([prog.c])
fi LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50060,7 +50060,7 @@
lt_sysroot= LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-case ${with_sysroot} in #( -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+case ${with_libtool_sysroot} in #( +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
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).
Some influential environment variables: #???
@@ -5879,29 +5879,29 @@ fi if test PATH = "$shlibpath_var"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 @@ -50274,7 +50274,7 @@
$as_echo_n "checking for sysroot... " >&6; } AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
-# Check whether --with-sysroot was given. LT_INIT
-if test "${with_sysroot+set}" = set; then : -sysroot=$with_sysroot
- withval=$with_sysroot; +sysroot=$with_libtool_sysroot
+# Check whether --with-libtool-sysroot was given. AC_SUBST([sysroot])
+if test "${with_libtool_sysroot+set}" = set; then : AC_OUTPUT(Makefile)
+ withval=$with_libtool_sysroot; _ATEOF
else @@ -50467,7 +50467,7 @@
- with_sysroot=no AC_PROG_CC
+ with_libtool_sysroot=no AC_CONFIG_SRCDIR([prog.c])
fi LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
AC_SUBST([sysroot])
AC_OUTPUT(Makefile)
_ATEOF
@@ -50824,7 +50824,7 @@
lt_sysroot= LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined"
-case ${with_sysroot} in #( -configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix"
+case ${with_libtool_sysroot} in #( +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
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).
Some influential environment variables: #???
@@ -6864,29 +6864,29 @@ fi if test PATH = "$shlibpath_var"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 @@ -51038,7 +51038,7 @@
$as_echo_n "checking for sysroot... " >&6; } AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c])
-# Check whether --with-sysroot was given. LT_INIT
-if test "${with_sysroot+set}" = set; then : -sysroot=$with_sysroot
- withval=$with_sysroot; +sysroot=$with_libtool_sysroot
+# Check whether --with-libtool-sysroot was given. AC_SUBST([sysroot])
+if test "${with_libtool_sysroot+set}" = set; then : AC_OUTPUT(Makefile)
+ withval=$with_libtool_sysroot; _ATEOF
else @@ -51231,7 +51231,7 @@
- with_sysroot=no AC_PROG_CC
+ with_libtool_sysroot=no AC_CONFIG_SRCDIR([prog.c])
fi LT_INIT
-sysroot=$with_sysroot
+sysroot=$with_libtool_sysroot
lt_sysroot= AC_SUBST([sysroot])
-case ${with_sysroot} in #( AC_OUTPUT(Makefile)
+case ${with_libtool_sysroot} in #( _ATEOF
yes) --- tests/sysroot.at 2015-01-16 19:52:04.000000000 +0100
if test "$GCC" = yes; then +++ tests/sysroot.at 2015-10-20 14:29:57.731254674 +0200
lt_sysroot=`$CC --print-sysroot 2>/dev/null` @@ -64,7 +64,7 @@
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
done]) done])
LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" 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" +configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix"
#??? #???
if test "$shlibpath_var" = PATH; then if test PATH = "$shlibpath_var"; then
@@ -114,7 +114,7 @@ AM_INIT_AUTOMAKE([foreign]) @@ -114,7 +114,7 @@
AC_PROG_CC AC_PROG_CC
AC_CONFIG_SRCDIR([lib2.c]) AC_CONFIG_SRCDIR([lib2.c])
LT_INIT LT_INIT
@ -644,7 +232,7 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
AC_SUBST([sysroot]) AC_SUBST([sysroot])
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
]]) ]])
@@ -155,7 +155,7 @@ AM_INIT_AUTOMAKE([foreign]) @@ -155,7 +155,7 @@
AC_PROG_CC AC_PROG_CC
AC_CONFIG_SRCDIR([prog.c]) AC_CONFIG_SRCDIR([prog.c])
LT_INIT LT_INIT
@ -653,47 +241,30 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
AC_SUBST([sysroot]) AC_SUBST([sysroot])
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)
]]) ]])
--- tests/tagdemo/configure --- m4/libtool.m4 2015-01-20 17:15:19.000000000 +0100
+++ tests/tagdemo/configure +++ m4/libtool.m4 2015-10-20 15:40:04.020631813 +0200
@@ -736,7 +736,7 @@ enable_static @@ -1245,29 +1245,29 @@
with_pic # _LT_WITH_SYSROOT
enable_fast_install # ----------------
with_gnu_ld AC_DEFUN([_LT_WITH_SYSROOT],
-with_sysroot -[AC_MSG_CHECKING([for sysroot])
+with_libtool_sysroot -AC_ARG_WITH([sysroot],
enable_libtool_lock -[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
with_gnu_ld +[AC_MSG_CHECKING([for libtool-sysroot])
' +AC_ARG_WITH([libtool-sysroot],
@@ -1392,7 +1392,7 @@ Optional Packages: +[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@],
--with-pic try to use only PIC/non-PIC objects [default=use [Search for dependent libraries within DIR (or the compiler's sysroot
both] if not specified).])],
--with-gnu-ld assume the C compiler uses GNU ld [default=no] -[], [with_sysroot=no])
- --with-sysroot=DIR Search for dependent libraries within DIR +[], [with_libtool_sysroot=no])
+ --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
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot= lt_sysroot=
-case ${with_sysroot} in #( -case $with_sysroot in #(
+case ${with_libtool_sysroot} in #( +case $with_libtool_sysroot in #(
yes) yes)
if test "$GCC" = yes; then if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null` lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi fi
;; #( ;; #(
@ -704,93 +275,8 @@ http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html
no|'') no|'')
;; #( ;; #(
*) *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 - AC_MSG_RESULT([$with_sysroot])
-$as_echo "${with_sysroot}" >&6; } + AC_MSG_RESULT([$with_libtool_sysroot])
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_libtool_sysroot}" >&5 AC_MSG_ERROR([The sysroot must be an absolute path.])
+$as_echo "${with_libtool_sysroot}" >&6; }
as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
;; ;;
esac 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

11
srcpkgs/libtool/patches/0004-use-sysroot-in-libpath.patch
View file

@ -5,13 +5,16 @@ i.e. when lt_sysroot is not set, it will still behave the same and add
-Khem Raj <raj.khem@gmail.com> -Khem Raj <raj.khem@gmail.com>
--- libltdl/config/ltmain.m4sh Adapted to libtool-2.4.6 build-aux/ltmain.in
+++ libltdl/config/ltmain.m4sh Jürgen Buchmüller <pullmoll@t-online.de>
@@ -6122,7 +6122,7 @@ func_mode_link ()
--- 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 fi
else else
# We cannot seem to hardcode it, guess we'll fake it. # 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" + add_dir="-L$lt_sysroot$libdir"
# Try looking first in the location we're being installed to. # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then if test -n "$inst_prefix_dir"; then

10
srcpkgs/libtool/template
View file

@ -1,19 +1,19 @@
# Template build file for 'libtool' # Template build file for 'libtool'
pkgname=libtool pkgname=libtool
version=2.4.2 version=2.4.6
revision=13 revision=1
hostmakedepends="perl automake help2man" hostmakedepends="perl automake help2man"
depends="tar sed" depends="tar sed"
build_style=gnu-configure build_style=gnu-configure
homepage="http://www.gnu.org/software/libtool" 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" short_desc="Generic library support script"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2" license="GPL-2"
checksum=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407 checksum=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f
pre_configure() { pre_configure() {
./bootstrap ./bootstrap --force
} }
libltdl-devel_package() { libltdl-devel_package() {