tools/libtool: bump to 2.4.6
This updates libtool to its current release, from 2015. Current patches
were renumbered and given a description text. The fix in
160-passthrough-ssp.patch is no longer needed.
A patch to speed up build was cherry-picked, and another openwrt
specific patch was needed to not use quotes in $(SHELL), to acommodate
our "SHELL=/usr/bin/env bash" usage.
The already present call to ./bootstrap ensures that generated files are
refreshed, so the patches are applied only to their sources. Also, that
bootstrap call was adjusted to run at the appropriate time when QUILT=1.
References below are relevant commits to upstream libtool
regarding some of the changes to patches.
This commit is being reapplied after previous revertion, and after some editing.
The fix for the issue that prompted reverting is the parent of this commit.
Ref: 435cb8d71 ("libtoolize: simplify runtime by substituting pkgauxdir")
Ref: 3cf11cfe2 ("libtoolize: rewritten over funclib.sh instead of general.m4sh")
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
[refactored to simplify patch changes, expanded patches, added upstream references]
Signed-off-by: Michael Pratt <mcpratt@pm.me>
This commit is contained in:
Eneas U de Queiroz
committed by
Hauke Mehrtens
Hauke Mehrtens
parent
a22c54e39f
commit
0d0cfe9f2d
@@ -8,73 +8,47 @@ This was originally commited to openwrt by Jo-Philipp Wich
|
||||
|
||||
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
|
||||
--- a/libltdl/config/general.m4sh
|
||||
+++ b/libltdl/config/general.m4sh
|
||||
@@ -45,15 +45,22 @@ progpath="$0"
|
||||
M4SH_VERBATIM([[
|
||||
: ${CP="cp -f"}
|
||||
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
||||
-: ${EGREP="@EGREP@"}
|
||||
-: ${FGREP="@FGREP@"}
|
||||
-: ${GREP="@GREP@"}
|
||||
: ${LN_S="@LN_S@"}
|
||||
: ${MAKE="make"}
|
||||
: ${MKDIR="mkdir"}
|
||||
: ${MV="mv -f"}
|
||||
: ${RM="rm -f"}
|
||||
-: ${SED="@SED@"}
|
||||
+if test -n "$STAGING_DIR_HOST"; then
|
||||
+ : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
|
||||
+ : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
|
||||
+ : ${GREP="$STAGING_DIR_HOST/bin/grep"}
|
||||
+ : ${SED="$STAGING_DIR_HOST/bin/sed"}
|
||||
+else
|
||||
+ : ${EGREP="@EGREP@"}
|
||||
+ : ${FGREP="@FGREP@"}
|
||||
+ : ${GREP="@GREP@"}
|
||||
+ : ${SED="@SED@"}
|
||||
+fi
|
||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||
: ${Xsed="$SED -e 1s/^X//"}
|
||||
|
||||
--- a/libtoolize.in
|
||||
+++ b/libtoolize.in
|
||||
@@ -334,15 +334,22 @@ as_unset=as_fn_unset
|
||||
@@ -38,14 +38,23 @@
|
||||
# with bootstrap, so set those here where they can still be over-
|
||||
# ridden by the user, but otherwise take precedence.
|
||||
|
||||
: ${CP="cp -f"}
|
||||
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
|
||||
-: ${AUTOCONF="autoconf"}
|
||||
-: ${AUTOMAKE="automake"}
|
||||
-: ${EGREP="@EGREP@"}
|
||||
-: ${FGREP="@FGREP@"}
|
||||
-: ${GREP="@GREP@"}
|
||||
: ${LN_S="@LN_S@"}
|
||||
: ${MAKE="make"}
|
||||
: ${MKDIR="mkdir"}
|
||||
: ${MV="mv -f"}
|
||||
: ${RM="rm -f"}
|
||||
-: ${SED="@SED@"}
|
||||
|
||||
+if test -n "$STAGING_DIR_HOST"; then
|
||||
+ : ${AUTOCONF="$STAGING_DIR_HOST/bin/autoconf"}
|
||||
+ : ${AUTOMAKE="$STAGING_DIR_HOST/bin/automake"}
|
||||
+ : ${EGREP="$STAGING_DIR_HOST/bin/grep -E"}
|
||||
+ : ${FGREP="$STAGING_DIR_HOST/bin/grep -F"}
|
||||
+ : ${GREP="$STAGING_DIR_HOST/bin/grep"}
|
||||
+ : ${SED="$STAGING_DIR_HOST/bin/sed"}
|
||||
+else
|
||||
+ : ${AUTOCONF="autoconf"}
|
||||
+ : ${AUTOMAKE="automake"}
|
||||
+ : ${EGREP="@EGREP@"}
|
||||
+ : ${FGREP="@FGREP@"}
|
||||
+ : ${GREP="@GREP@"}
|
||||
+ : ${SED="@SED@"}
|
||||
+fi
|
||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||
: ${Xsed="$SED -e 1s/^X//"}
|
||||
|
||||
@@ -2486,11 +2493,21 @@ func_check_macros ()
|
||||
all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
|
||||
## -------------------------- ##
|
||||
## Source external libraries. ##
|
||||
@@ -1901,11 +1910,21 @@ func_require_seen_libtool ()
|
||||
pkgmacro_files="@pkgmacro_files@"
|
||||
|
||||
# Locations for important files:
|
||||
- prefix=@prefix@
|
||||
- datadir=@datadir@
|
||||
- pkgdatadir=@pkgdatadir@
|
||||
- pkgltdldir=@pkgdatadir@
|
||||
- aclocaldir=@aclocaldir@
|
||||
- prefix="@prefix@"
|
||||
- datadir="@datadir@"
|
||||
- pkgauxdir="@pkgauxdir@"
|
||||
- pkgltdldir="@pkgdatadir@"
|
||||
- aclocaldir="@aclocaldir@"
|
||||
+ if test -n "$STAGING_DIR_HOST"; then
|
||||
+ prefix="$STAGING_DIR_HOST"
|
||||
+ datadir="$STAGING_DIR_HOST/share"
|
||||
@@ -90,41 +64,12 @@ Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
+ pkgltdldir="@pkgdatadir@"
|
||||
+ aclocaldir="@aclocaldir@"
|
||||
+ fi
|
||||
auxdir=
|
||||
macrodir=
|
||||
configure_ac=configure.in
|
||||
--- a/libtoolize.m4sh
|
||||
+++ b/libtoolize.m4sh
|
||||
@@ -1452,11 +1452,21 @@ func_check_macros ()
|
||||
all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h slist.c"
|
||||
|
||||
# Locations for important files:
|
||||
- prefix=@prefix@
|
||||
- datadir=@datadir@
|
||||
- pkgdatadir=@pkgdatadir@
|
||||
- pkgltdldir=@pkgdatadir@
|
||||
- aclocaldir=@aclocaldir@
|
||||
+ if test -n "$STAGING_DIR_HOST"; then
|
||||
+ prefix="$STAGING_DIR_HOST"
|
||||
+ datadir="$STAGING_DIR_HOST/share"
|
||||
+ pkgauxdir="$STAGING_DIR_HOST/share/libtool/build-aux"
|
||||
+ pkgdatadir="$STAGING_DIR_HOST/share/libtool"
|
||||
+ pkgltdldir="$STAGING_DIR_HOST/share/libtool"
|
||||
+ aclocaldir="$STAGING_DIR_HOST/share/aclocal"
|
||||
+ else
|
||||
+ prefix="@prefix@"
|
||||
+ datadir="@datadir@"
|
||||
+ pkgauxdir="@pkgauxdir@"
|
||||
+ pkgdatadir="@pkgdatadir@"
|
||||
+ pkgltdldir="@pkgdatadir@"
|
||||
+ aclocaldir="@aclocaldir@"
|
||||
+ fi
|
||||
auxdir=
|
||||
macrodir=
|
||||
configure_ac=configure.in
|
||||
--- a/libltdl/m4/libtool.m4
|
||||
+++ b/libltdl/m4/libtool.m4
|
||||
@@ -909,7 +909,7 @@ m4_defun([_LT_TAG_COMPILER],
|
||||
# Allow the user to override the master libtoolize repository:
|
||||
if test -n "$_lt_pkgdatadir"; then
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -931,7 +931,7 @@ m4_defun([_LT_TAG_COMPILER],
|
||||
[AC_REQUIRE([AC_PROG_CC])dnl
|
||||
|
||||
_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
|
||||
@@ -133,7 +78,7 @@ Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
|
||||
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
|
||||
|
||||
@@ -7660,9 +7660,9 @@ m4_defun([_LT_DECL_EGREP],
|
||||
@@ -8160,9 +8160,9 @@ m4_defun([_LT_DECL_EGREP],
|
||||
[AC_REQUIRE([AC_PROG_EGREP])dnl
|
||||
AC_REQUIRE([AC_PROG_FGREP])dnl
|
||||
test -z "$GREP" && GREP=grep
|
||||
@@ -146,7 +91,7 @@ Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
|
||||
AC_SUBST([GREP])
|
||||
])
|
||||
@@ -7695,9 +7695,8 @@ AC_SUBST([DLLTOOL])
|
||||
@@ -8195,9 +8195,8 @@ AC_SUBST([DLLTOOL])
|
||||
# as few characters as possible. Prefer GNU sed if found.
|
||||
m4_defun([_LT_DECL_SED],
|
||||
[AC_PROG_SED
|
||||
|
||||
Reference in New Issue
Block a user