Ticket #7983: patch-update-libtool-to-2.4.patch

File patch-update-libtool-to-2.4.patch, 5.7 KB (added by loswillios, 6 years ago)

update-libtool-to-2.4

  • package/libtool/Makefile

    diff --git a/package/libtool/Makefile b/package/libtool/Makefile
    index e5d1172..6641367 100644
    a b  
    88include $(TOPDIR)/rules.mk 
    99 
    1010PKG_NAME:=libtool 
    11 PKG_VERSION:=1.5.26 
     11PKG_VERSION:=2.4 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=@GNU/libtool 
    16 PKG_MD5SUM:=aa9c5107f3ec9ef4200eb6556f3b3c29 
     16PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021 
    1717 
    1818HOST_PATCH_DIR=/dev/null 
    1919 
    define Build/InstallDev 
    4545        $(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool 
    4646        $(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx 
    4747        $(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx 
     48        $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal 
     49        $(CP) $(2)/share/aclocal/* $(STAGING_DIR_HOST)/share/aclocal/ 
    4850endef 
    4951 
    5052define Package/libltdl/install 
  • deleted file package/libtool/patches/001-force_dlopen_deplibs.patch

    diff --git a/package/libtool/patches/001-force_dlopen_deplibs.patch b/package/libtool/patches/001-force_dlopen_deplibs.patch
    deleted file mode 100644
    index a95e5be..0000000
    + -  
    1 --- a/libltdl/acinclude.m4 
    2 +++ b/libltdl/acinclude.m4 
    3 @@ -6771,10 +6771,8 @@ AC_CACHE_CHECK([whether deplibs are load 
    4      ;; 
    5    esac 
    6    ]) 
    7 -if test "$libltdl_cv_sys_dlopen_deplibs" != yes; then 
    8   AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], 
    9      [Define if the OS needs help to load dependent libraries for dlopen().]) 
    10 -fi 
    11  ])# AC_LTDL_SYS_DLOPEN_DEPLIBS 
    12   
    13   
  • deleted file package/libtool/patches/100-libdir_path.patch

    diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
    deleted file mode 100644
    index 1132c38..0000000
    + -  
    1 --- a/Makefile.in 
    2 +++ b/Makefile.in 
    3 @@ -789,6 +789,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in 
    4         -rm -f ltmain.shT 
    5         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ 
    6         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ 
    7 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \ 
    8             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT 
    9         mv -f ltmain.shT $@ || \ 
    10         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) 
    11 --- a/ltmain.in 
    12 +++ b/ltmain.in 
    13 @@ -2827,7 +2827,7 @@ EOF 
    14               fi 
    15             else 
    16               # We cannot seem to hardcode it, guess we'll fake it. 
    17 -             add_dir="-L$libdir" 
    18 +             add_dir="-L@GLOBAL_LIBDIR@" 
    19               # Try looking first in the location we're being installed to. 
    20               if test -n "$inst_prefix_dir"; then 
    21                 case $libdir in 
    22 @@ -5669,7 +5669,7 @@ fi\ 
    23                   $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 
    24                   exit $EXIT_FAILURE 
    25                 fi 
    26 -               newdependency_libs="$newdependency_libs $libdir/$name" 
    27 +               newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name" 
    28                 ;; 
    29               *) newdependency_libs="$newdependency_libs $deplib" ;; 
    30               esac 
    31 @@ -5694,7 +5694,7 @@ fi\ 
    32                 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 
    33                 exit $EXIT_FAILURE 
    34               fi 
    35 -             newdlprefiles="$newdlprefiles $libdir/$name" 
    36 +             newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name" 
    37             done 
    38             dlprefiles="$newdlprefiles" 
    39           else 
    40 --- a/Makefile.am 
    41 +++ b/Makefile.am 
    42 @@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in 
    43         -rm -f ltmain.shT 
    44         date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ 
    45         sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ 
    46 +               -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \ 
    47             -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT 
    48         mv -f ltmain.shT $@ || \ 
    49         (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) 
  • deleted file package/libtool/patches/110-no_rpath.patch

    diff --git a/package/libtool/patches/110-no_rpath.patch b/package/libtool/patches/110-no_rpath.patch
    deleted file mode 100644
    index 685da9d..0000000
    + -  
    1 Well, brute force to disable rpath. 
    2  
    3 Only  
    4 -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) 
    5 +#hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) 
    6  
    7 should be necessary.... 
    8  
    9 --- a/libtool.m4 
    10 +++ b/libtool.m4 
    11 @@ -4601,16 +4601,16 @@ shlibpath_overrides_runpath=$shlibpath_o 
    12  hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) 
    13   
    14  # Whether we should hardcode library paths into libraries. 
    15 -hardcode_into_libs=$hardcode_into_libs 
    16 +hardcode_into_libs=no 
    17   
    18  # Flag to hardcode \$libdir into a binary during linking. 
    19  # This must work even if \$libdir does not exist. 
    20 -hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) 
    21 +hardcode_libdir_flag_spec= 
    22   
    23  # If ld is used when linking, flag to hardcode \$libdir into 
    24  # a binary during linking. This must work even if \$libdir does 
    25  # not exist. 
    26 -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) 
    27 +hardcode_libdir_flag_spec_ld= 
    28   
    29  # Whether we need a single -rpath flag with a separated argument. 
    30  hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) 
  • deleted file package/libtool/patches/120-libdir_search.patch

    diff --git a/package/libtool/patches/120-libdir_search.patch b/package/libtool/patches/120-libdir_search.patch
    deleted file mode 100644
    index 91ece84..0000000
    + -  
    1 --- a/ltmain.in 
    2 +++ b/ltmain.in 
    3 @@ -2444,8 +2444,14 @@ EOF 
    4             absdir="$abs_ladir" 
    5             libdir="$abs_ladir" 
    6           else 
    7 -           dir="$libdir" 
    8 -           absdir="$libdir" 
    9 +            # Adding 'libdir' from the .la file to our library search paths 
    10 +            # breaks crosscompilation horribly.  We cheat here and don't add 
    11 +            # it, instead adding the path where we found the .la.  -CL 
    12 +           dir="$abs_ladir" 
    13 +           absdir="$abs_ladir" 
    14 +           libdir="$abs_ladir" 
    15 +           #dir="$libdir" 
    16 +           #absdir="$libdir" 
    17           fi 
    18           test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes 
    19         else