소스 검색

revert automake update, add back libtool patch required for relinking issues f.e. vlc

Waldemar Brodkorb 2 년 전
부모
커밋
07089fd724
3개의 변경된 파일34개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      package/automake/Makefile
  2. 11 0
      package/automake/patches/patch-Makefile_in
  3. 20 0
      package/libtool/patches/patch-m4_libtool_m4

+ 3 - 3
package/automake/Makefile

@@ -4,10 +4,10 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		automake
-PKG_VERSION:=		1.16.3
-PKG_EXTRAVER:=		1.16
+PKG_VERSION:=		1.15.1
+PKG_EXTRAVER:=		1.15
 PKG_RELEASE:=		1
-PKG_HASH:=		ff2bf7656c4d1c6fdda3b8bebb21f09153a736bcba169aaf65eab25fa113bf3a
+PKG_HASH:=		af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
 PKG_DESCR:=		tool for automatically generating makefiles
 PKG_SECTION:=		dev/tools
 PKG_BUILDDEP:=		m4-host autoconf-host autoconf

+ 11 - 0
package/automake/patches/patch-Makefile_in

@@ -0,0 +1,11 @@
+--- automake-1.15.1.orig/Makefile.in	2017-06-18 19:35:04.000000000 +0200
++++ automake-1.15.1/Makefile.in	2020-10-31 08:38:23.322590385 +0100
+@@ -710,7 +710,7 @@ update_mans = \
+   $(AM_V_GEN): \
+     && $(MKDIR_P) doc \
+     && $(extend_PATH) \
+-    && $(PERL) $(srcdir)/doc/help2man --output=$@
++    && $(PERL) $(srcdir)/doc/help2man --no-discard-stderr --output=$@
+ 
+ amhello_sources = \
+   doc/amhello/configure.ac \

+ 20 - 0
package/libtool/patches/patch-m4_libtool_m4

@@ -0,0 +1,20 @@
+--- libtool-2.4.6.orig/m4/libtool.m4	2015-01-20 17:15:19.000000000 +0100
++++ libtool-2.4.6/m4/libtool.m4	2015-06-04 11:48:09.000000000 +0200
+@@ -4950,7 +4950,7 @@ m4_if([$1], [CXX], [
+   _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  _LT_TAGVAR(hardcode_automatic, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
+   _LT_TAGVAR(hardcode_direct, $1)=no
+   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+@@ -6308,7 +6308,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(inherit_rpath, $1)=no
+ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=