domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/libtool: update to 2.4.2

Browse Source 
Refresh patches.
Remove upstreamed: 001-fix-func_append.patch

Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
This commit is contained in:
Ivan Pavlov
2021-09-05 22:54:12 +03:00
committed by Hans Dedecker
parent ae33ce2af2
commit cdc646c032
9 changed files with 26 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/libtool/Makefile
View File

@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libtool PKG_NAME:=libtool
PKG_CPE_ID:=cpe:/a:gnu:libtool PKG_CPE_ID:=cpe:/a:gnu:libtool
PKG_VERSION:=2.4 PKG_VERSION:=2.4.2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME) PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae PKG_HASH:=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1

12
tools/libtool/patches/000-relocatable.patch
View File

@@ -29,7 +29,7 @@
--- a/libtoolize.in --- a/libtoolize.in
+++ b/libtoolize.in +++ b/libtoolize.in
@@ -326,15 +326,22 @@ as_unset=as_fn_unset @@ -334,15 +334,22 @@ as_unset=as_fn_unset
: ${CP="cp -f"} : ${CP="cp -f"}
test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
@@ -56,7 +56,7 @@
: ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
: ${Xsed="$SED -e 1s/^X//"} : ${Xsed="$SED -e 1s/^X//"}
@@ -2476,10 +2483,17 @@ func_check_macros () @@ -2487,10 +2494,17 @@ func_check_macros ()
# Locations for important files: # Locations for important files:
prefix=@prefix@ prefix=@prefix@
@@ -80,7 +80,7 @@
configure_ac=configure.in configure_ac=configure.in
--- a/libtoolize.m4sh --- a/libtoolize.m4sh
+++ b/libtoolize.m4sh +++ b/libtoolize.m4sh
@@ -1450,10 +1450,17 @@ func_check_macros () @@ -1453,10 +1453,17 @@ func_check_macros ()
# Locations for important files: # Locations for important files:
prefix=@prefix@ prefix=@prefix@
@@ -104,7 +104,7 @@
configure_ac=configure.in configure_ac=configure.in
--- a/libltdl/m4/libtool.m4 --- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4
@@ -875,9 +875,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], []) @@ -907,9 +907,8 @@ dnl AC_DEFUN([AC_LIBTOOL_RC], [])
# ---------------- # ----------------
m4_defun([_LT_TAG_COMPILER], m4_defun([_LT_TAG_COMPILER],
[AC_REQUIRE([AC_PROG_CC])dnl [AC_REQUIRE([AC_PROG_CC])dnl
@@ -115,7 +115,7 @@
_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl _LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl _LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
@@ -7509,9 +7508,9 @@ m4_defun([_LT_DECL_EGREP], @@ -7660,9 +7659,9 @@ m4_defun([_LT_DECL_EGREP],
[AC_REQUIRE([AC_PROG_EGREP])dnl [AC_REQUIRE([AC_PROG_EGREP])dnl
AC_REQUIRE([AC_PROG_FGREP])dnl AC_REQUIRE([AC_PROG_FGREP])dnl
test -z "$GREP" && GREP=grep test -z "$GREP" && GREP=grep
@@ -128,7 +128,7 @@
dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
AC_SUBST([GREP]) AC_SUBST([GREP])
]) ])
@@ -7544,9 +7543,8 @@ AC_SUBST([DLLTOOL]) @@ -7695,9 +7694,8 @@ AC_SUBST([DLLTOOL])
# as few characters as possible. Prefer GNU sed if found. # as few characters as possible. Prefer GNU sed if found.
m4_defun([_LT_DECL_SED], m4_defun([_LT_DECL_SED],
[AC_PROG_SED [AC_PROG_SED

22
tools/libtool/patches/001-fix-func_append.patch
View File

@@ -1,22 +0,0 @@
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7261,7 +7261,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
--- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh
@@ -8050,7 +8050,7 @@ EOF
elif test -n "$runpath_var"; then
case "$perm_rpath " in
*" $libdir "*) ;;
- *) func_apped perm_rpath " $libdir" ;;
+ *) func_append perm_rpath " $libdir" ;;
esac
fi
done

12
tools/libtool/patches/100-libdir-fixes.patch
View File

@@ -1,6 +1,6 @@
--- a/libltdl/config/ltmain.m4sh --- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh
@@ -5715,8 +5715,14 @@ func_mode_link () @@ -5731,8 +5731,14 @@ func_mode_link ()
absdir="$abs_ladir" absdir="$abs_ladir"
libdir="$abs_ladir" libdir="$abs_ladir"
else else
@@ -17,7 +17,7 @@
fi fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else else
@@ -6114,8 +6120,6 @@ func_mode_link () @@ -6130,8 +6136,6 @@ func_mode_link ()
add="$libdir/$linklib" add="$libdir/$linklib"
fi fi
else else
@@ -26,7 +26,7 @@
# 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
case $libdir in case $libdir in
@@ -6270,7 +6274,17 @@ func_mode_link () @@ -6286,7 +6290,17 @@ func_mode_link ()
fi fi
;; ;;
*) *)
@@ -47,7 +47,7 @@
else else
--- a/libltdl/config/ltmain.sh --- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh +++ b/libltdl/config/ltmain.sh
@@ -6504,8 +6504,14 @@ func_mode_link () @@ -6518,8 +6518,14 @@ func_mode_link ()
absdir="$abs_ladir" absdir="$abs_ladir"
libdir="$abs_ladir" libdir="$abs_ladir"
else else
@@ -64,7 +64,7 @@
fi fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else else
@@ -6903,8 +6909,6 @@ func_mode_link () @@ -6917,8 +6923,6 @@ func_mode_link ()
add="$libdir/$linklib" add="$libdir/$linklib"
fi fi
else else
@@ -73,7 +73,7 @@
# 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
case $libdir in case $libdir in
@@ -7059,7 +7063,17 @@ func_mode_link () @@ -7073,7 +7077,17 @@ func_mode_link ()
fi fi
;; ;;
*) *)

4
tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
View File

@@ -1,6 +1,6 @@
--- a/libltdl/config/ltmain.m4sh --- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh
@@ -6104,7 +6104,6 @@ func_mode_link () @@ -6120,7 +6120,6 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then
@@ -10,7 +10,7 @@
case :$finalize_shlibpath: in case :$finalize_shlibpath: in
--- a/libltdl/config/ltmain.sh --- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh +++ b/libltdl/config/ltmain.sh
@@ -6893,7 +6893,6 @@ func_mode_link () @@ -6907,7 +6907,6 @@ func_mode_link ()
test "$hardcode_direct_absolute" = no; then test "$hardcode_direct_absolute" = no; then
add="$libdir/$linklib" add="$libdir/$linklib"
elif test "$hardcode_minus_L" = yes; then elif test "$hardcode_minus_L" = yes; then

2
tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
View File

@@ -12,7 +12,7 @@
'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
--- a/libltdl/config/ltmain.sh --- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh +++ b/libltdl/config/ltmain.sh
@@ -2972,6 +2972,9 @@ func_mode_install () @@ -2973,6 +2973,9 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi fi

4
tools/libtool/patches/150-trailingslash.patch
View File

@@ -11,7 +11,7 @@ Nitin A Kamble <nitin.a.kamble@intel.com>
--- a/libltdl/config/ltmain.m4sh --- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh +++ b/libltdl/config/ltmain.m4sh
@@ -2164,8 +2164,15 @@ func_mode_install () @@ -2167,8 +2167,15 @@ func_mode_install ()
func_append dir "$objdir" func_append dir "$objdir"
if test -n "$relink_command"; then if test -n "$relink_command"; then
@@ -30,7 +30,7 @@ Nitin A Kamble <nitin.a.kamble@intel.com>
# location b/c this prevents finding dependent libraries that # location b/c this prevents finding dependent libraries that
--- a/libltdl/config/ltmain.sh --- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh +++ b/libltdl/config/ltmain.sh
@@ -2953,8 +2953,15 @@ func_mode_install () @@ -2954,8 +2954,15 @@ func_mode_install ()
func_append dir "$objdir" func_append dir "$objdir"
if test -n "$relink_command"; then if test -n "$relink_command"; then

2
tools/libtool/patches/160-passthrough-ssp.patch
View File

@@ -1,7 +1,7 @@
diff -ur libtool-2.4.orig/libltdl/config/ltmain.m4sh libtool-2.4/libltdl/config/ltmain.m4sh diff -ur libtool-2.4.orig/libltdl/config/ltmain.m4sh libtool-2.4/libltdl/config/ltmain.m4sh
--- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2015-06-18 10:46:15.499996979 +0200 --- libtool-2.4.orig/libltdl/config/ltmain.m4sh 2015-06-18 10:46:15.499996979 +0200
+++ libtool-2.4/libltdl/config/ltmain.m4sh 2015-06-18 10:48:24.686882213 +0200 +++ libtool-2.4/libltdl/config/ltmain.m4sh 2015-06-18 10:48:24.686882213 +0200
@@ -5061,7 +5061,7 @@ @@ -5076,7 +5076,7 @@
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \

12
tools/libtool/patches/200-openwrt-branding.patch
View File

@@ -28,7 +28,7 @@
: :
--- a/libltdl/config/ltmain.sh --- a/libltdl/config/ltmain.sh
+++ b/libltdl/config/ltmain.sh +++ b/libltdl/config/ltmain.sh
@@ -443,7 +443,7 @@ opt_warning=: @@ -439,7 +439,7 @@ opt_warning=:
# name if it has been set yet. # name if it has been set yet.
func_echo () func_echo ()
{ {
@@ -37,7 +37,7 @@
} }
# func_verbose arg... # func_verbose arg...
@@ -469,14 +469,14 @@ func_echo_all () @@ -465,14 +465,14 @@ func_echo_all ()
# Echo program name prefixed message to standard error. # Echo program name prefixed message to standard error.
func_error () func_error ()
{ {
@@ -56,7 +56,7 @@
: :
--- a/libtoolize.in --- a/libtoolize.in
+++ b/libtoolize.in +++ b/libtoolize.in
@@ -640,7 +640,7 @@ opt_warning=: @@ -648,7 +648,7 @@ opt_warning=:
# name if it has been set yet. # name if it has been set yet.
func_echo () func_echo ()
{ {
@@ -65,7 +65,7 @@
} }
# func_verbose arg... # func_verbose arg...
@@ -666,14 +666,14 @@ func_echo_all () @@ -674,14 +674,14 @@ func_echo_all ()
# Echo program name prefixed message to standard error. # Echo program name prefixed message to standard error.
func_error () func_error ()
{ {
@@ -84,7 +84,7 @@
: :
--- a/tests/defs.in --- a/tests/defs.in
+++ b/tests/defs.in +++ b/tests/defs.in
@@ -588,7 +588,7 @@ opt_warning=: @@ -596,7 +596,7 @@ opt_warning=:
# name if it has been set yet. # name if it has been set yet.
func_echo () func_echo ()
{ {
@@ -93,7 +93,7 @@
} }
# func_verbose arg... # func_verbose arg...
@@ -614,14 +614,14 @@ func_echo_all () @@ -622,14 +622,14 @@ func_echo_all ()
# Echo program name prefixed message to standard error. # Echo program name prefixed message to standard error.
func_error () func_error ()
{ {