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

mk/pkg-bottom.mk

@@ -142,7 +142,7 @@ else
 	@echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
 	@exit 1
 endif
-	@for a in ${WRKINST}/usr/bin/*-config; do \
+	@for a in ${WRKINST}/usr/bin/*-config*; do \
 		[[ -e $$a ]] || continue; \
 		sed -e "s,^prefix=.*,prefix=${STAGING_TARGET_DIR}/usr," $$a > \
 		${STAGING_DIR}/usr/bin/$$(basename $$a); \
@@ -172,7 +172,7 @@ endif
 	    	-exec echo 'WARNING: ${PKG_NAME} installs files in /lib -' \
 		' fix this!' >&2 \; -quit 2>/dev/null; fi;\
 	    find usr ! -type d 2>/dev/null | \
-	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^/usr/lib/libpthread_nonshared.a' | \
+	    grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/src' -e '^usr/doc' -e '^usr/local' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config*' -e '^/usr/lib/libpthread_nonshared.a' | \
 	    tee '${STAGING_PKG_DIR}/${PKG_NAME}' | \
 	    $(TOOLS_DIR)/cpio -padlmu '${STAGING_DIR}'
 	@cd '${STAGING_DIR}'; grep 'usr/lib/.*\.la$$' \

toolchain/uClibc/patches/0.9.33.2/target_arch.patch

@@ -1,6 +1,19 @@
+diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in
+--- uClibc-0.9.33.2.orig/extra/Configs/Config.in	2012-05-15 09:20:09.000000000 +0200
++++ uClibc-0.9.33.2/extra/Configs/Config.in	2012-10-01 12:17:14.000000000 +0200
+@@ -235,6 +235,9 @@
+ 	default "i486" if CONFIG_486
+ 	default "i586" if CONFIG_586 || CONFIG_586MMX
+ 	default "i686" if TARGET_ARCH = "i386"
++	default "mips" if CONFIG_MIPS_N32_ABI
++	default "mips" if CONFIG_MIPS_O32_ABI
++	default "mips64" if CONFIG_MIPS_N64_ABI
+ 	default ""
+ 
+ source "extra/Configs/Config.in.arch"
 diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak
 --- uClibc-0.9.33.2.orig/Rules.mak	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/Rules.mak	2012-09-21 19:28:45.000000000 +0200
++++ uClibc-0.9.33.2/Rules.mak	2012-10-01 11:28:26.000000000 +0200
 @@ -118,7 +118,7 @@
  LIBC := libc
  SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION)
@@ -10,14 +23,3 @@ diff -Nur uClibc-0.9.33.2.orig/Rules.mak uClibc-0.9.33.2/Rules.mak
  UCLIBC_LDSO_NAME := ld64-uClibc
  ARCH_NATIVE_BIT := 64
  else
-diff -Nur uClibc-0.9.33.2.orig/extra/Configs/Config.in uClibc-0.9.33.2/extra/Configs/Config.in
---- uClibc-0.9.33.2.orig/extra/Configs/Config.in	2012-05-15 09:20:09.000000000 +0200
-+++ uClibc-0.9.33.2/extra/Configs/Config.in	2012-09-21 19:29:11.000000000 +0200
-@@ -235,6 +235,7 @@
- 	default "i486" if CONFIG_486
- 	default "i586" if CONFIG_586 || CONFIG_586MMX
- 	default "i686" if TARGET_ARCH = "i386"
-+	default "mips64" if CONFIG_MIPS_ISA_MIPS64
- 	default ""
- 
- source "extra/Configs/Config.in.arch"