diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-17 19:11:03 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-17 19:11:03 +0100 |
| commit | c6fa9771807b4438e35df864de9a01fb768d33d2 (patch) | |
| tree | bab4f1f979e46d6459eceb65b90368dfd07c4788 | |
| parent | 664dea7d95839a01be7c551add09994bce7be959 (diff) | |
| parent | 09fa85e012be73f239bb78ce267abab7a62837b1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
target/Config.in
| -rw-r--r-- | target/Config.in | 2 | ||||
| -rw-r--r-- | toolchain/eglibc/patches/make382.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/target/Config.in b/target/Config.in index a835f5d36..66e6fd1b4 100644 --- a/target/Config.in +++ b/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 || \ diff --git a/toolchain/eglibc/patches/make382.patch b/toolchain/eglibc/patches/make382.patch new file mode 100644 index 000000000..99ccf2bf8 --- /dev/null +++ b/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) |