tools: libtool: update to 2.4.2

This patch refreshes the patches and fixes an error
message generated by compiling the host version of libjson-c:

|libtool: Version mismatch error.  This is libtool 2.4.2, but the
|libtool: definition of this LT_INIT comes from libtool 2.4.
|libtool: You should recreate aclocal.m4 with macros from libtool 2.4.2
|libtool: and run autoconf again.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
index dd4a7f63809a0064644da6e2bb1b482491838091..2bc9db7d0dabff54ae372bedb0a47dc850917c90 100644 (file)
--- a/tools/libtool/Makefile
+++ b/tools/libtool/Makefile
@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=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_URL:=@GNU/$(PKG_NAME)
-PKG_HASH:=afcce660d3dc54c63a0a5ba3cf05272239dc3c54bbeba20f6bad250f9dc007ae
+PKG_HASH:=1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407
 
 HOST_BUILD_PARALLEL:=1
 

diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch
index 55265fe5332eb22019cea4b57ce8f45b29ad9c79..6d1651be317a28cb0e2457a4d400403a1c553cc8 100644 (file)
--- a/tools/libtool/patches/000-relocatable.patch
+++ b/tools/libtool/patches/000-relocatable.patch
@@ -29,7 +29,7 @@
  
 --- a/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"}
  test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
@@ -56,7 +56,7 @@
  : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
  : ${Xsed="$SED -e 1s/^X//"}
  
-@@ -2476,10 +2483,17 @@ func_check_macros ()
+@@ -2487,10 +2494,17 @@ func_check_macros ()
  
    # Locations for important files:
    prefix=@prefix@
@@ -80,7 +80,7 @@
    configure_ac=configure.in
 --- a/libtoolize.m4sh
 +++ b/libtoolize.m4sh
-@@ -1450,10 +1450,17 @@ func_check_macros ()
+@@ -1453,10 +1453,17 @@ func_check_macros ()
  
    # Locations for important files:
    prefix=@prefix@
@@ -104,7 +104,7 @@
    configure_ac=configure.in
 --- a/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],
  [AC_REQUIRE([AC_PROG_CC])dnl
@@ -115,7 +115,7 @@
  _LT_TAGDECL([CC], [compiler], [1], [A language specific 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_FGREP])dnl
  test -z "$GREP" && GREP=grep
@@ -128,7 +128,7 @@
  dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
  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.
  m4_defun([_LT_DECL_SED],
  [AC_PROG_SED

diff --git a/tools/libtool/patches/001-fix-func_append.patch b/tools/libtool/patches/001-fix-func_append.patch
deleted file mode 100644 (file)
index 4c3c07b..0000000
--- a/tools/libtool/patches/001-fix-func_append.patch
+++ /dev/null
@@ -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

diff --git a/tools/libtool/patches/100-libdir-fixes.patch b/tools/libtool/patches/100-libdir-fixes.patch
index d4e6f785ccd6412f4f2bf21bf2e300f72100aeb5..3df2b14b60b92f68f86de32df8978a07e57df2fd 100644 (file)
--- a/tools/libtool/patches/100-libdir-fixes.patch
+++ b/tools/libtool/patches/100-libdir-fixes.patch
@@ -1,6 +1,6 @@
 --- a/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"
            libdir="$abs_ladir"
          else
@@ -17,7 +17,7 @@
          fi
          test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
        else
-@@ -6114,8 +6120,6 @@ func_mode_link ()
+@@ -6130,8 +6136,6 @@ func_mode_link ()
                add="$libdir/$linklib"
              fi
            else
@@ -26,7 +26,7 @@
              # Try looking first in the location we're being installed to.
              if test -n "$inst_prefix_dir"; then
                case $libdir in
-@@ -6270,7 +6274,17 @@ func_mode_link ()
+@@ -6286,7 +6290,17 @@ func_mode_link ()
                  fi
                  ;;
                *)
@@ -47,7 +47,7 @@
                else
 --- a/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"
            libdir="$abs_ladir"
          else
@@ -64,7 +64,7 @@
          fi
          test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
        else
-@@ -6903,8 +6909,6 @@ func_mode_link ()
+@@ -6917,8 +6923,6 @@ func_mode_link ()
                add="$libdir/$linklib"
              fi
            else
@@ -73,7 +73,7 @@
              # Try looking first in the location we're being installed to.
              if test -n "$inst_prefix_dir"; then
                case $libdir in
-@@ -7059,7 +7063,17 @@ func_mode_link ()
+@@ -7073,7 +7077,17 @@ func_mode_link ()
                  fi
                  ;;
                *)

diff --git a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
index c78058934ad5e7efef8b7c4f4b52248f58238277..bbfd12500306d5a26696d7af84a7c50fb1660b43 100644 (file)
--- a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
+++ b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
@@ -1,6 +1,6 @@
 --- a/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
              add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then
@@ -10,7 +10,7 @@
              case :$finalize_shlibpath: in
 --- a/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
              add="$libdir/$linklib"
            elif test "$hardcode_minus_L" = yes; then

diff --git a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
index 1c3df4c0049a6f0d0e03152307a1ab85233152e2..d5729e68ac6f0a1a9e8d11db83d59a16da7e7655 100644 (file)
--- a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
+++ b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
@@ -1,6 +1,6 @@
 --- a/libltdl/config/ltmain.m4sh
 +++ b/libltdl/config/ltmain.m4sh
-@@ -2183,6 +2183,9 @@ func_mode_install ()
+@@ -2186,6 +2186,9 @@ func_mode_install ()
            relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
          fi
  
@@ -12,7 +12,7 @@
            'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
 --- a/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@%%"`
          fi
  

diff --git a/tools/libtool/patches/150-trailingslash.patch b/tools/libtool/patches/150-trailingslash.patch
index a01f9be77b1594f908a78ece71d6091f70189ce0..423911cf4be1d93fc7b76e9bd4b2350bb050adf1 100644 (file)
--- a/tools/libtool/patches/150-trailingslash.patch
+++ b/tools/libtool/patches/150-trailingslash.patch
@@ -11,7 +11,7 @@ Nitin A Kamble <nitin.a.kamble@intel.com>
 
 --- a/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"
  
        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
 --- a/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"
  
        if test -n "$relink_command"; then

diff --git a/tools/libtool/patches/160-passthrough-ssp.patch b/tools/libtool/patches/160-passthrough-ssp.patch
index 9fad9aa9df7ebe29d9237b4b242f966256abae52..2f6838cb85253d7a593ef618957a09777ccb2a29 100644 (file)
--- a/tools/libtool/patches/160-passthrough-ssp.patch
+++ b/tools/libtool/patches/160-passthrough-ssp.patch
@@ -1,7 +1,6 @@
-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/libltdl/config/ltmain.m4sh     2015-06-18 10:48:24.686882213 +0200
-@@ -5061,7 +5061,7 @@
+--- a/libltdl/config/ltmain.m4sh
++++ b/libltdl/config/ltmain.m4sh
+@@ -5076,7 +5076,7 @@ func_mode_link ()
        # -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*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \

diff --git a/tools/libtool/patches/200-openwrt-branding.patch b/tools/libtool/patches/200-openwrt-branding.patch
index dd3e3d6b784ec85d3d08b65f7f9e82e285443efe..3fc0afb866549472decf38fa06a67a1e638284d2 100644 (file)
--- a/tools/libtool/patches/200-openwrt-branding.patch
+++ b/tools/libtool/patches/200-openwrt-branding.patch
@@ -28,7 +28,7 @@
      :
 --- a/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.
  func_echo ()
  {
@@ -37,7 +37,7 @@
  }
  
  # 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.
  func_error ()
  {
@@ -56,7 +56,7 @@
      :
 --- a/libtoolize.in
 +++ b/libtoolize.in
-@@ -640,7 +640,7 @@ opt_warning=:
+@@ -648,7 +648,7 @@ opt_warning=:
  # name if it has been set yet.
  func_echo ()
  {
@@ -65,7 +65,7 @@
  }
  
  # 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.
  func_error ()
  {
@@ -84,7 +84,7 @@
      :
 --- a/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.
  func_echo ()
  {
@@ -93,7 +93,7 @@
  }
  
  # 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.
  func_error ()
  {