fix static linking of alsa-lib. handle -static like -all-static in libtool. idea from buildroot

3 files changed, 59 insertions, 1 deletions

diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 9e8c31f7c..8e101e0d9 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -21,6 +21,8 @@ include ${ADK_TOPDIR}/mk/package.mk
 $(eval $(call HOST_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE}))
 $(eval $(call PKG_template,ALSA_LIB,alsa-lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+AUTOTOOL_STYLE:=	autoreconf
+
 ifneq ($(ADK_HOST_LINUX),y)
 HOST_LINUX_ONLY:=	1
 endif
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index cef0c56e2..7ce821071 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libtool
 PKG_VERSION:=		2.4.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		2ec8997e0c07249eb4cbd072417d70fe
 PKG_DESCR:=		generic dynamic object loading library
 PKG_SECTION:=		dev/tools
diff --git a/package/libtool/patches/patch-libltdl_config_ltmain_sh b/package/libtool/patches/patch-libltdl_config_ltmain_sh
new file mode 100644
index 000000000..3feefb75c
--- /dev/null
+++ b/package/libtool/patches/patch-libltdl_config_ltmain_sh
@@ -0,0 +1,56 @@
+--- libtool-2.4.2.orig/libltdl/config/ltmain.sh	2011-10-17 12:19:35.000000000 +0200
++++ libtool-2.4.2/libltdl/config/ltmain.sh	2014-08-15 15:01:04.000000000 +0200
+@@ -5176,7 +5176,7 @@ func_mode_link ()
+ 	;;
+       -all-static | -static | -static-libtool-libs)
+ 	case $arg in
+-	-all-static)
++	-all-static|-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    func_warning "complete static linking is impossible in this configuration"
+ 	  fi
+@@ -5185,12 +5185,6 @@ func_mode_link ()
+ 	  fi
+ 	  prefer_static_libs=yes
+ 	  ;;
+-	-static)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=built
+-	  ;;
+ 	-static-libtool-libs)
+ 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ 	    dlopen_self=$dlopen_self_static
+@@ -5473,7 +5467,7 @@ func_mode_link ()
+       prevarg="$arg"
+ 
+       case $arg in
+-      -all-static)
++      -all-static|-static)
+ 	if test -n "$link_static_flag"; then
+ 	  # See comment for -static flag below, for more details.
+ 	  func_append compile_command " $link_static_flag"
+@@ -5754,12 +5748,7 @@ func_mode_link ()
+ 	continue
+ 	;;
+ 
+-      -static | -static-libtool-libs)
+-	# The effects of -static are defined in a previous loop.
+-	# We used to do the same as -all-static on platforms that
+-	# didn't have a PIC flag, but the assumption that the effects
+-	# would be equivalent was wrong.  It would break on at least
+-	# Digital Unix and AIX.
++      -static-libtool-libs)
+ 	continue
+ 	;;
+ 
+@@ -5853,7 +5842,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=*| \
+-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"