Browse Source

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

Conflicts:
	target/Config.in
Waldemar Brodkorb 13 years ago
parent
commit
c6fa977180
2 changed files with 14 additions and 0 deletions
  1. 2 0
      target/Config.in
  2. 12 0
      toolchain/eglibc/patches/make382.patch

+ 2 - 0
target/Config.in

@@ -580,6 +580,7 @@ config ADK_TARGET_LIB_EGLIBC
 	depends on ADK_LINUX_QEMU || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
+		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB4XX || \
@@ -595,6 +596,7 @@ config ADK_TARGET_LIB_GLIBC
 	depends on ADK_LINUX_QEMU || \
 		ADK_LINUX_X86 || \
 		ADK_LINUX_X86_64 || \
+		ADK_LINUX_ARM_FOXG20 || \
 		ADK_LINUX_X86_ALIX || \
 		ADK_LINUX_X86_WRAP || \
 		ADK_LINUX_MIPS_RB532 || \

+ 12 - 0
toolchain/eglibc/patches/make382.patch

@@ -0,0 +1,12 @@
+diff -Nur eglibc-2.12.1.orig/libc/sunrpc/Makefile eglibc-2.12.1/libc/sunrpc/Makefile
+--- eglibc-2.12.1.orig/libc/sunrpc/Makefile	2010-09-28 19:14:27.000000000 +0200
++++ eglibc-2.12.1/libc/sunrpc/Makefile	2010-11-14 21:30:49.000000000 +0100
+@@ -106,7 +106,7 @@
+ endif
+ 
+ ifneq (yes,$(install-bootstrap-headers))
+-headers += $(rpcsvc:%.x=rpcsvc/%.h)
++#headers += $(rpcsvc:%.x=rpcsvc/%.h)
+ extra-libs-$(OPTION_EGLIBC_SUNRPC) += librpcsvc
+ # Make it in `others' pass, not `lib' pass.
+ extra-libs-others-y += $(extra-libs-y)