X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2FuClibc%2FMakefile;h=7fce989542d265c612e90859035ce6af0352ba65;hb=8e4255397198574a9cd1354e194cb65bdd2051c0;hp=732911215eb2b6112da38472f5fd1f7e14d09335;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d;p=lede-git%2F.git diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 732911215e..7fce989542 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:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION) +PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) include $(INCLUDE_DIR)/host-build.mk @@ -23,6 +24,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ -e 's/i.86/i386/' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/g' \ + -e 's/avr32.*/avr32/g' \ -e 's/m68k.*/m68k/' \ -e 's/ppc/powerpc/g' \ -e 's/v850.*/v850/g' \ @@ -51,6 +53,9 @@ endif $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(PKG_BUILD_DIR)/.config 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 +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 @@ -68,7 +73,7 @@ define Build/Configure endef define Build/Compile - PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ + PATH=$(TARGET_PATH) $(MAKE) -j $(CONFIG_JLEVEL) -C $(PKG_BUILD_DIR) \ PREFIX= \ DEVEL_PREFIX=/ \ RUNTIME_PREFIX=/ \ @@ -89,6 +94,7 @@ 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