X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/afb078518646798b2913e27d56dc9d0828f7886e..7efebe60e89ec6d0c9630affe04d8892c574553b:/toolchain/uClibc/Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 0c01a25b5..45dbcef0c 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -39,14 +39,18 @@ ifeq ($(PKG_VERSION),0.9.29)
   endif
 endif
 
+ifeq ($(PKG_VERSION),0.9.30)
+  ifeq ($(PKG_EXTRAVERSION),)
+    PKG_MD5SUM:=e5766e2566e0297adebebbcc0aba1f2d
+  endif
+endif
+
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
   PATCH_DIR:=
   CONFIG_DIR:=./config
   PKG_MD5SUM:=
 endif
 
-PKG_CAT:=bzcat
-
 STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
 BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
@@ -118,7 +122,8 @@ define Build/Prepare
 	$(call Build/Prepare/V_0_9_28)
  endif
 	$(SED) 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(BUILD_DIR_TOOLCHAIN)/linux-dev/usr/include\",g' \
-		-e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=$(if $(CONFIG_SOFT_FLOAT),n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,y),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,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=$(if $(CONFIG_LARGEFILE),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' \
@@ -130,8 +135,10 @@ define Build/Prepare
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
 		HOSTCC="$(HOSTCC)" \
+		CC="$(TARGET_CC)" \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
-		pregen install_dev;
+		pregen \
+		$(if $(CONFIG_UCLIBC_VERSION_0_9_28),install_dev,install_headers)
 endef
 
 define Build/Configure