Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 3 insertions, 121 deletions

diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index f65676a4d..0ebccef6e 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		irssi
-PKG_VERSION:=		0.8.16
+PKG_VERSION:=		0.8.17
 PKG_RELEASE:=		1
-PKG_HASH:=		688b1761d99662075f1882268c95e843186cb1c2e6e696c1623b02467f2602a5
+PKG_HASH:=		0ae01f76797fb6d6b8e0f2268b39c7afb90ac62658ec754c82acfc344b8203e9
 PKG_DESCR:=		irc text client
 PKG_SECTION:=		app/chat
 PKG_DEPENDS:=		glib libncurses
diff --git a/package/libtool/patches/patch-configure b/package/libtool/patches/patch-configure
deleted file mode 100644
index e95e35cce..000000000
--- a/package/libtool/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- libtool-2.4.2.orig/configure	2011-10-17 12:18:58.000000000 +0200
-+++ libtool-2.4.2/configure	2013-10-31 16:17:18.508406500 +0100
-@@ -9340,7 +9340,7 @@ $as_echo_n "checking whether the $compil
-   enable_shared_with_static_runtimes=no
-   export_dynamic_flag_spec=
-   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  hardcode_automatic=no
-+  hardcode_automatic=yes
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
-@@ -13694,7 +13694,7 @@ hardcode_libdir_flag_spec_CXX=
- hardcode_libdir_separator_CXX=
- hardcode_minus_L_CXX=no
- hardcode_shlibpath_var_CXX=unsupported
--hardcode_automatic_CXX=no
-+hardcode_automatic_CXX=yes
- inherit_rpath_CXX=no
- module_cmds_CXX=
- module_expsym_cmds_CXX=
diff --git a/package/libtool/patches/patch-libltdl_config_ltmain_m4sh b/package/libtool/patches/patch-libltdl_config_ltmain_m4sh
deleted file mode 100644
index d6ebba7b6..000000000
--- a/package/libtool/patches/patch-libltdl_config_ltmain_m4sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh	2011-10-17 12:17:05.000000000 +0200
-+++ libtool-2.4.2/libltdl/config/ltmain.m4sh	2013-10-30 18:43:07.053853500 +0100
-@@ -5066,7 +5066,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"
diff --git a/package/libtool/patches/patch-libltdl_config_ltmain_sh b/package/libtool/patches/patch-libltdl_config_ltmain_sh
deleted file mode 100644
index 3feefb75c..000000000
--- a/package/libtool/patches/patch-libltdl_config_ltmain_sh
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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"
diff --git a/package/libtool/patches/patch-libltdl_configure b/package/libtool/patches/patch-libltdl_configure
deleted file mode 100644
index 95fffd3c1..000000000
--- a/package/libtool/patches/patch-libltdl_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool-2.4.2.orig/libltdl/configure	2011-10-17 12:19:47.000000000 +0200
-+++ libtool-2.4.2/libltdl/configure	2013-10-31 16:17:57.695906500 +0100
-@@ -8690,7 +8690,7 @@ $as_echo_n "checking whether the $compil
-   enable_shared_with_static_runtimes=no
-   export_dynamic_flag_spec=
-   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  hardcode_automatic=no
-+  hardcode_automatic=yes
-   hardcode_direct=no
-   hardcode_direct_absolute=no
-   hardcode_libdir_flag_spec=
diff --git a/package/libtool/patches/patch-libltdl_m4_libtool_m4 b/package/libtool/patches/patch-libltdl_m4_libtool_m4
deleted file mode 100644
index 1ef213478..000000000
--- a/package/libtool/patches/patch-libltdl_m4_libtool_m4
+++ /dev/null
@@ -1,20 +0,0 @@
---- libtool-2.4.2.orig/libltdl/m4/libtool.m4	2011-10-17 12:17:05.000000000 +0200
-+++ libtool-2.4.2/libltdl/m4/libtool.m4	2013-10-31 16:50:11.016431400 +0100
-@@ -4592,7 +4592,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)=
-@@ -5840,7 +5840,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)=
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 0097bda6d..5dfacc95f 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -12,7 +12,7 @@ PKG_SECTION:=		base/shells
 PKG_URL:=		http://www.mirbsd.org/mksh.htm
 PKG_SITES:=		$(MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/)
 
-PKG_DFLT_MKSH:=		y if (!ADK_TOOLCHAIN_ONLY && !ADK_TARGET_UCLINUX)
+PKG_DFLT_MKSH:=		y if (!ADK_TOOLCHAIN_ONLY && ADK_TARGET_WITH_MMU)
 
 DISTFILES:=		$(PKG_NAME)-R$(PKG_VERSION).tgz
 WRKDIST=		$(WRKDIR)/$(PKG_NAME)