diff options
| author | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-11-05 21:18:39 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <walsimou@walsimou.com> | 2009-11-05 21:18:39 +0100 |
| commit | 33ef148ffac9d61f11a13982fbe10f0bcebc7c59 (patch) | |
| tree | 11e0fabf9189dc0a0f89aebba0726b042a825a71 | |
| parent | 8c86904495eeded7bdd34634653152bd55f71587 (diff) | |
| download | embtoolkit-33ef148ffac9d61f11a13982fbe10f0bcebc7c59.tar.gz embtoolkit-33ef148ffac9d61f11a13982fbe10f0bcebc7c59.tar.bz2 embtoolkit-33ef148ffac9d61f11a13982fbe10f0bcebc7c59.tar.xz | |
Toolchain: uClibc: fix various build error by patching uClibc
Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
| -rw-r--r-- | kconfig/uclibc-kconfigs/uclibc.kconfig | 5 | ||||
| -rwxr-xr-x | mk/uclibc.mk | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/kconfig/uclibc-kconfigs/uclibc.kconfig b/kconfig/uclibc-kconfigs/uclibc.kconfig index 00010eb..3e6d47b 100644 --- a/kconfig/uclibc-kconfigs/uclibc.kconfig +++ b/kconfig/uclibc-kconfigs/uclibc.kconfig @@ -36,10 +36,15 @@ choice config EMBTK_UCLIBC_VERSION_0_9_30_1 bool "uClibc-0.9.30.1" + select EMBTK_UCLIBC_NEED_PATCH config EMBTK_UCLIBC_VERSION_0_9_30 bool "uClibc-0.9.30" + select EMBTK_UCLIBC_NEED_PATCH endchoice +config EMBTK_UCLIBC_NEED_PATCH + bool + config KEMBTK_UCLIBC_TARGET_alpha bool default n diff --git a/mk/uclibc.mk b/mk/uclibc.mk index f502457..dcc8198 100755 --- a/mk/uclibc.mk +++ b/mk/uclibc.mk @@ -24,6 +24,7 @@ UCLIBC_VERSION := $(subst ",,$(strip $(CONFIG_EMBTK_UCLIBC_VERSION_STRING))) UCLIBC_SITE := http://www.uclibc.org/downloads +UCLIBC_PATCH_SITE := ftp://ftp.embtoolkit.org/embtoolkit.org/uclibc UCLIBC_PACKAGE := uClibc-$(UCLIBC_VERSION).tar.bz2 UCLIBC_BUILD_DIR := $(TOOLS_BUILD)/uClibc-$(UCLIBC_VERSION) @@ -53,14 +54,20 @@ uclibc_download: @test -e $(DOWNLOAD_DIR)/$(UCLIBC_PACKAGE) || \ wget $(UCLIBC_SITE)/$(UCLIBC_PACKAGE) \ -O $(DOWNLOAD_DIR)/$(UCLIBC_PACKAGE) +ifeq ($(CONFIG_EMBTK_UCLIBC_NEED_PATCH),y) + @test -e $(DOWNLOAD_DIR)/uClibc-$(UCLIBC_VERSION).patch || \ + wget -O $(DOWNLOAD_DIR)/uClibc-$(UCLIBC_VERSION).patch \ + $(UCLIBC_PATCH_SITE)/uClibc-$(UCLIBC_VERSION)-*.patch +endif $(UCLIBC_BUILD_DIR)/.decompressed: $(call EMBTK_GENERIC_MESSAGE,"Decompressing \ uClibc-$(UCLIBC_VERSION) ...") $(Q)tar -C $(TOOLS_BUILD) -xjvf $(DOWNLOAD_DIR)/$(UCLIBC_PACKAGE) +ifeq ($(CONFIG_EMBTK_UCLIBC_NEED_PATCH),y) $(Q)cd $(UCLIBC_BUILD_DIR); \ - cat $(DOWNLOAD_DIR)/uClibc-$(UCLIBC_VERSION)-*.patch | \ - patch -p1 + patch -p1 < $(DOWNLOAD_DIR)/uClibc-$(UCLIBC_VERSION).patch +endif $(UCLIBC_BUILD_DIR)/.configured: $(call EMBTK_GENERIC_MESSAGE,"Configuring \ |