X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e7bb94ce95b0fc7b6c23e3a909efcd8fcd01f633..293af18664fd175403e2fe79688c9d4860798e92:/toolchain/uClibc/Makefile?ds=sidebyside diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 8b445b604..d74d1ecfc 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -12,10 +12,10 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) ifeq ($(PKG_VERSION),0.9.32) PKG_SOURCE_URL:=git://git.busybox.net/uClibc PKG_SOURCE_PROTO:=git - PKG_SOURCE_VERSION:=bb8551685e2efc42c65a01479b9f9bb8b860da01 + PKG_SOURCE_VERSION:=f6450b67cc92027352367be299cc28dd29cd8486 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz - LIBC_SO_VERSION:=$(PKG_VERSION)-rc2-git + LIBC_SO_VERSION:=$(PKG_VERSION)-rc3-git else PKG_SOURCE_URL:=http://www.uclibc.org/downloads PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,8 +24,6 @@ endif PATCH_DIR:=./patches-$(PKG_VERSION) CONFIG_DIR:=./config-$(PKG_VERSION) -PKG_MD5SUM_0.9.30.1 = 1a4b84e5536ad8170563ffa88c34679c -PKG_MD5SUM_0.9.31 = 52fb8a494758630c8d3ddd7f1e0daafd PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)) HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)-$(PKG_VERSION) @@ -61,10 +59,11 @@ endef GEN_CONFIG=$(SCRIPT_DIR)/kconfig.pl -n \ $(if $(wildcard $(CONFIG_DIR)/common),'+' $(CONFIG_DIR)/common) \ $(if $(CONFIG_UCLIBC_ENABLE_DEBUG),$(if $(wildcard $(CONFIG_DIR)/debug),'+' $(CONFIG_DIR)/debug)) \ - $(CONFIG_DIR)/$(ARCH)$(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD)) + $(CONFIG_DIR)/$(ARCH)$(strip \ + $(if $(wildcard $(CONFIG_DIR)/$(ARCH).$(BOARD)),.$(BOARD), \ + $(if $(CONFIG_HAS_SPE_FPU),$(if $(wildcard $(CONFIG_DIR)/$(ARCH).e500),.e500)))) define Host/Prepare - $(call Host/SetToolchainInfo) $(call Host/Prepare/Default) $(if $(strip $(QUILT)), \ cd $(HOST_BUILD_DIR); \ @@ -77,8 +76,6 @@ define Host/Prepare $(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/include\",g' \ -e 's,^.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n,y),g' \ -e 's,^.*UCLIBC_HAS_SOFT_FLOAT.*,UCLIBC_HAS_SOFT_FLOAT=$(if $(CONFIG_SOFT_FLOAT),y,n),g' \ - -e 's,^.*CONFIG_ARM_EABI.*,CONFIG_ARM_EABI=$(if $(CONFIG_EABI_SUPPORT),y,n),g' \ - -e 's,^.*CONFIG_ARM_OABI.*,CONFIG_ARM_OABI=$(if $(CONFIG_EABI_SUPPORT),n,y),g' \ -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \ $(HOST_BUILD_DIR)/.config $(MAKE) -C $(HOST_BUILD_DIR) oldconfig KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS" @@ -134,6 +131,7 @@ define Host/Compile endef define Host/Install + $(call Host/SetToolchainInfo) $(UCLIBC_MAKE) PREFIX= utils $(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin $(INSTALL_BIN) \