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

65 files changed, 3096 insertions, 144 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index d62773bd3..008c4eb4f 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		MesaLib
 PKG_VERSION:=		8.0.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		cda5d101f43b8784fa60bdeaca4056f2
 PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
diff --git a/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
new file mode 100644
index 000000000..f1d92ca8c
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_gallium_auxiliary_util_u_debug_symbol_c
@@ -0,0 +1,26 @@
+--- Mesa-8.0.5.orig/src/gallium/auxiliary/util/u_debug_symbol.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/gallium/auxiliary/util/u_debug_symbol.c	2013-09-25 17:45:12.000000000 +0200
+@@ -151,23 +151,6 @@ debug_symbol_name_dbghelp(const void *ad
+ }
+ #endif
+ 
+-#ifdef __GLIBC__
+-#include <execinfo.h>
+-
+-/* This can only provide dynamic symbols, or binary offsets into a file.
+- *
+- * To fix this, post-process the output with tools/addr2line.sh
+- */
+-static INLINE void
+-debug_symbol_name_glibc(const void *addr, char* buf, unsigned size)
+-{
+-   char** syms = backtrace_symbols((void**)&addr, 1);
+-   strncpy(buf, syms[0], size);
+-   buf[size - 1] = 0;
+-   free(syms);
+-}
+-#endif
+-
+ void
+ debug_symbol_name(const void *addr, char* buf, unsigned size)
+ {
diff --git a/package/MesaLib/patches/patch-src_glsl_strtod_c b/package/MesaLib/patches/patch-src_glsl_strtod_c
new file mode 100644
index 000000000..ce6514dbb
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_strtod_c
@@ -0,0 +1,32 @@
+--- Mesa-8.0.5.orig/src/glsl/strtod.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/glsl/strtod.c	2013-09-25 17:34:06.000000000 +0200
+@@ -25,14 +25,6 @@
+ 
+ 
+ #include <stdlib.h>
+-
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+ #include "strtod.h"
+ 
+ 
+@@ -44,14 +36,5 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtod_l(s, end, loc);
+-#else
+    return strtod(s, end);
+-#endif
+ }
diff --git a/package/MesaLib/patches/patch-src_mesa_main_imports_c b/package/MesaLib/patches/patch-src_mesa_main_imports_c
new file mode 100644
index 000000000..10cbca86a
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_mesa_main_imports_c
@@ -0,0 +1,33 @@
+--- Mesa-8.0.5.orig/src/mesa/main/imports.c	2012-10-24 21:03:59.000000000 +0200
++++ Mesa-8.0.5/src/mesa/main/imports.c	2013-09-25 17:41:11.000000000 +0200
+@@ -49,14 +49,6 @@
+ #include "mtypes.h"
+ #include "version.h"
+ 
+-#ifdef _GNU_SOURCE
+-#include <locale.h>
+-#ifdef __APPLE__
+-#include <xlocale.h>
+-#endif
+-#endif
+-
+-
+ #define MAXSTRING 4000  /* for vsnprintf() */
+ 
+ #ifdef WIN32
+@@ -766,14 +758,7 @@ _mesa_strdup( const char *s )
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \
+-   !defined(ANDROID) && !defined(__HAIKU__)
+-   static locale_t loc = NULL;
+-   if (!loc) {
+-      loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+-   }
+-   return strtof_l(s, end, loc);
+-#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
++#if defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+    return strtof(s, end);
+ #else
+    return (float)strtod(s, end);
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8f9f1b3d6..0d6881c48 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b65e9a04181bd7c9db7667a4566f8dc3
 PKG_DESCR:=		ALSA mixer utility
 PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		alsa-lib libpthread
+PKG_DEPENDS:=		alsa-lib libpthread libgcc
 PKG_BUILDDEP:=		alsa-lib
 PKG_URL:=		http://www.alsa-project.org/
 PKG_SITES:=		ftp://ftp.alsa-project.org/pub/utils/
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 605922737..8ff743270 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -65,6 +65,9 @@ endif
 ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILE),y)
 	$(SED) 's#ttyS#ttyAMA#g' $(IDIR_BASE_FILES)/etc/inittab
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ARANYM),y)
+	$(SED) 's#ttyS#nfcon0#g' $(IDIR_BASE_FILES)/etc/inittab
+endif
 	$(SED) 's#@SPEED@#$(ADK_RUNTIME_CONSOLE_SERIAL_SPEED)#' $(IDIR_BASE_FILES)/etc/inittab
 	test -z $(ADK_RUNTIME_HOSTNAME) || \
 	    echo $(ADK_RUNTIME_HOSTNAME) > $(IDIR_BASE_FILES)/etc/hostname; \
diff --git a/package/base-files/src/etc/init.d/umount b/package/base-files/src/etc/init.d/umount
index bcd545999..49bd5a020 100755
--- a/package/base-files/src/etc/init.d/umount
+++ b/package/base-files/src/etc/init.d/umount
@@ -5,7 +5,7 @@ case $1 in
 autostop)
 	cd /
 	sync
-	for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }');do
+	for i in $(grep -v ^# /etc/fstab 2>/dev/null|awk '{ print $2 }'|grep -v none);do
        	 umount $i 2>/dev/null
 	done
 	;;
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 168b20070..cce3246fa 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		boost
 PKG_VERSION:=		1.54.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		efbfbff5a85a9330951f243d0a46e4b9
 PKG_DESCR:=		boost C++ library
 PKG_SECTION:=		libs
@@ -15,7 +15,7 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=boost/}
 DISTFILES:=		boost_1_54_0.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}_1_54_0
 
-PKG_ARCH_DEPENDS:=	!mips
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 
 PKG_SUBPKGS:=		BOOST BOOST_DEV
 PKGSD_BOOST_DEV:=	boost header files
diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp
new file mode 100644
index 000000000..5b09e892b
--- /dev/null
+++ b/package/boost/patches/patch-boost_cstdint_hpp
@@ -0,0 +1,14 @@
+--- boost_1_54_0.orig/boost/cstdint.hpp	2013-03-09 23:55:05.000000000 +0100
++++ boost_1_54_0/boost/cstdint.hpp	2013-09-19 16:46:42.000000000 +0200
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H)                                 \
++  && (!defined(__GLIBC__)                                       \
++      || defined(__GLIBC_HAVE_LONG_LONG)                        \
++      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+ 
+ // The following #include is an implementation artifact; not part of interface.
+ # ifdef __hpux
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index 93453d917..887a60425 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -10,6 +10,7 @@ PKG_MD5SUM:=		f101a9e88b783337b20b2e26dfd26d5f
 PKG_DESCR:=		cairo graphics library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		fontconfig libfreetype libpng libx11 pixman
+PKG_DEPENDS+=		libxrender
 PKG_BUILDDEP:=		libpng pixman freetype fontconfig libX11 libXrender glib
 PKG_BUILDDEP+=		libXext
 PKG_URL:=		http://cairographics.org/
diff --git a/package/cifs-utils/Makefile b/package/cifs-utils/Makefile
index 4b718b07d..e12c6caf7 100644
--- a/package/cifs-utils/Makefile
+++ b/package/cifs-utils/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		cifs-utils
-PKG_VERSION:=		6.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		371e007a201be90c16497cd9bd5e2553
+PKG_VERSION:=		6.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		f83ef48ab1154aa74dd4cf1c1202bf04
 PKG_DESCR:=		CIFS utilities
 PKG_SECTION:=		net/fs
 PKG_DEPENDS:=		kmod-cifs
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 942e88942..af8ffaf3d 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,16 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		5.0.1
+PKG_VERSION:=		5.4.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		a405d6cca021748fea43b60348b72b0c
+PKG_MD5SUM:=		d4176b3066f3b85d85343d3648ea43f6
 PKG_DESCR:=		System statistics collection daemon
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP:=		libtool
+PKG_DEPENDS:=		libpthread libltdl
 PKG_URL:=		http://collectd.org/
 PKG_SITES:=		http://collectd.org/files/
 
 PKG_FLAVOURS_COLLECTD:=	WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING
+PKG_FLAVOURS_COLLECTD+=	WITH_RRD
+PKGFD_WITH_RRD:=	enable RRD output
+PKGFB_WITH_RRD:=	rrdtool
+PKGFS_WITH_RRD:=	librrd
 PKGFD_WITH_CPU:=	collect CPU statistics
 PKGFD_WITH_LOAD:=	collect system load statistics
 PKGFD_WITH_MEMORY:=	collect memory usage statistics
@@ -36,11 +41,14 @@ ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y)
 DISABLE_PING:=--disable-ping
 endif
 
-CONFIGURE_ARGS+=	--disable-apache \
+CONFIGURE_ARGS+=	--disable-aggregation \
+			--disable-apache \
 			--disable-apcups \
 			--disable-apple_sensors \
 			--disable-ascent \
 			--disable-battery \
+			--disable-cgroups \
+			--disable-conntrack \
 			${DISABLE_CPU} \
 			--disable-cpufreq \
 			--disable-contextswitch \
@@ -50,6 +58,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-dns \
 			--disable-email \
 			--disable-entropy \
+			--disable-ethstat \
 			--disable-exec \
 			--disable-filecount \
 			--disable-fscache \
@@ -61,38 +70,47 @@ CONFIGURE_ARGS+=	--disable-apache \
 			${DISABLE_LOAD} \
 			--disable-madwifi \
 			--disable-mbmon \
+			--disable-md \
 			--disable-memcached \
 			${DISABLE_MEMORY} \
 			--disable-multimeter \
 			--disable-mysql \
-			--disable-openvpn \
-			--disable-python \
-			--disable-postgresql \
-			--disable-powerdns \
 			--disable-network \
 			--disable-nginx \
 			--disable-nfs \
 			--disable-ntpd \
+			--disable-numa \
 			--disable-nut \
+			--disable-olsrd \
+			--disable-openvpn \
+			--disable-python \
+			--disable-postgresql \
+			--disable-powerdns \
 			--disable-perl \
 			${DISABLE_PING} \
 			--disable-processes \
+			--disable-protocols \
 			--disable-sensors \
 			--disable-serial \
 			--disable-logfile \
+			--disable-statsd \
 			--disable-swap \
-			--disable-syslog \
+			--enable-syslog \
 			--disable-tape \
 			--disable-target_notification \
 			--disable-target_replace \
 			--disable-target_set \
+			--disable-tcpconns \
 			--disable-teamspeak2 \
 			--disable-ted \
 			--disable-thermal \
 			--disable-unixsock \
 			--disable-users \
+			--disable-uptime \
+			--disable-uuid \
 			--disable-vserver \
 			--disable-wireless \
+			--disable-write_graphite \
 			--disable-write_http \
 			--with-fp-layout=nothing \
 			--without-java \
@@ -106,6 +124,9 @@ XAKE_FLAGS+=		LIBS='-lm -lltdl'
 post-install:
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
 		${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/share/collectd
+	${CP} ${WRKINST}/usr/share/collectd/types.db \
+		${IDIR_COLLECTD}/usr/share/collectd
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/collectd/*.so \
 		${IDIR_COLLECTD}/usr/lib/collectd
diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
deleted file mode 100644
index d1580516a..000000000
--- a/package/collectd/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,13 +0,0 @@
---- collectd-5.0.1.orig/src/Makefile.in	2011-10-14 22:54:14.000000000 +0200
-+++ collectd-5.0.1/src/Makefile.in	2011-10-22 18:57:51.000000000 +0200
-@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
- # too. -octo
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
- @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
--@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
-+@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
- @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
- @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
- @BUILD_AIX_TRUE@am__append_19 = -lm
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 552a12122..de0ed663c 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a70edc50524f258eaf5c9a9994ed8748
 PKG_DESCR:=		DBUS library and daemon
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libexpat libx11
-PKG_BUILDDEP:=		expat libX11
+PKG_DEPENDS:=		libexpat libx11 libuuid
+PKG_BUILDDEP:=		expat libX11 util-linux
 PKG_URL:=		http://dbus.freedesktop.org/
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
 
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DBUS,dbus,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,DBUS_DEV,dbus-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBUS_DEV},${PKGSC_DBUS_DEV},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-luuid
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
diff --git a/package/fltk/Makefile b/package/fltk/Makefile
index 8ac5c3c21..de5cb6459 100644
--- a/package/fltk/Makefile
+++ b/package/fltk/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		fltk
 PKG_VERSION:=		1.3.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		9f7e707d4fb7a5a76f0f9b73ff70623d
 PKG_DESCR:=		fast light toolkit
 PKG_SECTION:=		libs
@@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLTK,libfltk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc
+LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc
 ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 LIBRARIES+=-lssp -lssp_nonshared
 endif
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index aeb37e177..da0b141af 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		lang
@@ -14,7 +14,7 @@ PKG_BUILDDEP:=		libffi zlib
 PKG_URL:=		http://jamvm.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jamvm/}
 
-PKG_ARCH_DEPENDS:=	!cris !mips !avr32
+PKG_ARCH_DEPENDS:=	!cris !avr32
 
 include ${TOPDIR}/mk/package.mk
 
@@ -24,6 +24,12 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 CONFIGURE_ARGS+=	--enable-ffi
+ifeq ($(ARCH),mips)
+CONFIGURE_ARGS+=	--disable-tls
+endif
+ifeq ($(ARCH),arm)
+CONFIGURE_ARGS+=	--disable-tls
+endif
 
 do-build:
 	${INSTALL_DIR} ${WRKINST}/usr/bin
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index 26baf5d36..beabb3201 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.5.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		395455e4d3a51459374fe5ca8420aae8
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11/libs
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--enable-xlocale \
 libx11-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/lib/libX11.so* ${IDIR_LIBX11}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/libX11-xcb* ${IDIR_LIBX11}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libX11-xcb*.so* ${IDIR_LIBX11}/usr/lib/
 	${CP} ${WRKINST}/usr/share/X11/XErrorDB ${IDIR_LIBX11}/usr/share/X11
 	${CP} ${WRKINST}/usr/share/X11/locale ${IDIR_LIBX11}/usr/share/X11
 
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 003cd9783..9c024504c 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -11,7 +11,7 @@ PKG_SECTION:=		libs
 
 NO_DISTFILES:=		1
 
-PKG_ARCH_DEPENDS:=	!sh !avr32
+PKG_ARCH_DEPENDS:=	!avr32
 
 include ${TOPDIR}/mk/package.mk
 
@@ -24,8 +24,12 @@ INSTALL_STYLE:=		manual
 do-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+ifeq ($(ADK_LINUX_SH),y)
+	${CP} ${STAGING_TARGET_DIR}/lib/!m1/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
+else
 	${CP} ${STAGING_TARGET_DIR}/$(ADK_TARGET_LIBC_PATH)/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
+endif
 ifeq ($(ADK_TARGET_MULTILIB_X86_32),y)
 	${INS