diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-08-26 20:24:47 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-08-26 20:24:47 +0000 |
| commit | 499ddee51b2547b1c9b9242af6b4c3506c750e75 (patch) | |
| tree | d3a282e2b40ed47b808952217d89850b50ff78f3 /rules/klibc.make | |
| parent | 2ae0d4d9018559846cf9dad876b027772da1e454 (diff) | |
| download | ptxdist-499ddee51b2547b1c9b9242af6b4c3506c750e75.tar.gz ptxdist-499ddee51b2547b1c9b9242af6b4c3506c750e75.tar.xz | |
* klibc: version update; fix arm config
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8791 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules/klibc.make')
| -rw-r--r-- | rules/klibc.make | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/rules/klibc.make b/rules/klibc.make index 088652d1f..1f8b13c2a 100644 --- a/rules/klibc.make +++ b/rules/klibc.make @@ -2,7 +2,7 @@ # $Id: template 3345 2005-11-14 17:14:19Z rsc $ # # Copyright (C) 2005 by Sascha Hauer -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -17,10 +17,12 @@ PACKAGES-$(PTXCONF_KLIBC) += klibc # # Paths and names # -KLIBC_VERSION := 1.4.30 +KLIBC_VERSION := 1.5.14 KLIBC := klibc-$(KLIBC_VERSION) KLIBC_SUFFIX := tar.gz -KLIBC_URL := http://www.kernel.org/pub/linux/libs/klibc/Testing/1.4.x/$(KLIBC).$(KLIBC_SUFFIX) +KLIBC_URL := \ + http://www.kernel.org/pub/linux/libs/klibc/Testing/$(KLIBC).$(KLIBC_SUFFIX) \ + http://eu.kernel.org/pub/linux/libs/klibc/Testing/$(KLIBC).$(KLIBC_SUFFIX) KLIBC_SOURCE := $(SRCDIR)/$(KLIBC).$(KLIBC_SUFFIX) KLIBC_DIR := $(BUILDDIR)/$(KLIBC) @@ -66,6 +68,19 @@ KLIBC_ENV := $(CROSS_ENV) $(STATEDIR)/klibc.prepare: $(klibc_prepare_deps_default) @$(call targetinfo, $@) + echo > $(KLIBC_DIR)/defconfig + echo "CONFIG_KLIBC=y" >> $(KLIBC_DIR)/defconfig + echo "CONFIG_KLIBC_ERRLIST=y" >> $(KLIBC_DIR)/defconfig + echo "CONFIG_KLIBC_ZLIB=y" >> $(KLIBC_DIR)/defconfig +ifdef PTXCONF_ARCH_ARM + echo "# ARM options" >> $(KLIBC_DIR)/defconfig + echo "# CONFIG_KLIBC_THUMB is not set" >> $(KLIBC_DIR)/defconfig + echo "CONFIG_AEABI=y" >> $(KLIBC_DIR)/defconfig +endif +ifdef PTXCONF_ARCH_X86 + echo "# i386 option" >> $(KLIBC_DIR)/defconfig + echo "CONFIG_REGPARM=y" >> $(KLIBC_DIR)/defconfig +endif @$(call touch, $@) # ---------------------------------------------------------------------------- |