X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a35fb6c438c11e118d9241be1cdf6d3e06b7c9bb..270fe35d13f87ccf41feef8642c47a968a480a37:/toolchain/uClibc/Makefile?ds=inline diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index bb52ee300..74936e97f 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -9,13 +9,14 @@ include $(INCLUDE_DIR)/target.mk PKG_NAME:=uClibc PKG_VERSION:=0.9.28 +PKG_EXTRAVERSION:=.2 -PKG_SOURCE:=uClibc-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 PKG_SOURCE_URL:=http://www.uclibc.org/downloads -PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29 +PKG_MD5SUM:=959f25286e317f0d9e2103445c5a14c2 PKG_CAT:=bzcat -PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION) +PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) include $(INCLUDE_DIR)/host-build.mk @@ -52,13 +53,16 @@ endif ifeq ($(CONFIG_SOFT_FLOAT),y) $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(PKG_BUILD_DIR)/.config endif - mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include - mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib - mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib - $(MAKE) -C $(PKG_BUILD_DIR) \ - PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ +ifeq ($(CONFIG_C99_MATH),y) + $(SED) 's,.*DO_C99_MATH.*,DO_C99_MATH=y,g' $(PKG_BUILD_DIR)/.config +endif + mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include + mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib + mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib + PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ + PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \ DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ + RUNTIME_PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \ HOSTCC="$(HOSTCC)" \ CPU_CFLAGS="$(TARGET_CFLAGS)" \ pregen install_dev; @@ -68,7 +72,7 @@ define Build/Configure endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ + PATH=$(TARGET_PATH) $(MAKE) -j $(CONFIG_JLEVEL) -C $(PKG_BUILD_DIR) \ PREFIX= \ DEVEL_PREFIX=/ \ RUNTIME_PREFIX=/ \ @@ -89,10 +93,11 @@ define Build/Install RUNTIME_PREFIX=/ \ install_dev echo $(PKG_VERSION) > $(STAGING_DIR)/uclibc_version + echo $(PKG_VERSION)$(PKG_EXTRAVERSION) > $(STAGING_DIR)/uclibc_extra_version endef define Build/Clean - rm -rf $(PKG_BUILD_DIR) $(TOOL_BUILD_DIR)/uClibc_dev + rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev endef $(eval $(call HostBuild))