fix pesky kmod-* ipkg install bug

[openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 22c5913..7fdba8a 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,4 +1,11 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 PKG_NAME:=uClibc
 PKG_VERSION:=0.9.28
@@ -8,7 +15,7 @@ PKG_SOURCE_URL:=http://www.uclibc.org/downloads
 PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
@@ -29,7 +36,11 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
-       $(CP) ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
+       if [ -e config/$(ARCH).$(BOARD) ]; then \
+               $(CP) config/$(ARCH).$(BOARD) $(PKG_BUILD_DIR)/.config; \
+       else \
+               $(CP) config/$(ARCH) $(PKG_BUILD_DIR)/.config; \
+       fi
        $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \
                $(PKG_BUILD_DIR)/.config
 ifeq ($(CONFIG_LARGEFILE),y)
@@ -41,13 +52,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;
@@ -57,7 +71,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=/ \
@@ -81,7 +95,7 @@ define Build/Install
 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))