fix pesky kmod-* ipkg install bug

[openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index d77f554..7fdba8a 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,24 +1,23 @@
-include $(TOPDIR)/rules.mk
-
-#############################################################
+# 
+# Copyright (C) 2006 OpenWrt.org

 #
 #

-# uClibc (the C library)
+# 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

 
 

-ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-# Be aware that this changes daily....
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc
-UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2
-#"
-UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
-UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"}
-else
-UCLIBC_VER:=0.9.28
-UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER)
-UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2
-UCLIBC_SITE:=http://www.uclibc.org/downloads
-endif
+PKG_NAME:=uClibc
+PKG_VERSION:=0.9.28
+
+PKG_SOURCE:=uClibc-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.uclibc.org/downloads
+PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
+PKG_CAT:=bzcat
+
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/host-build.mk

 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/i.86/i386/' \
 
 UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/i.86/i386/' \


@@ -34,70 +33,69 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
                -e 's/cris.*/cris/' \
 )
 
                -e 's/cris.*/cris/' \
 )
 

-
-$(DL_DIR)/$(UCLIBC_SOURCE):
-       mkdir -p $(DL_DIR)
-       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(UCLIBC_SOURCE) x $(UCLIBC_SITE)
-
-$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
-       mkdir -p $(TOOL_BUILD_DIR)
-       bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(UCLIBC_DIR) ./patches
-       touch $(UCLIBC_DIR)/.unpacked
-
-$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked
-       $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak
-       $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config
+define Build/Prepare
+       $(call Build/Prepare/Default)
+       $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(PKG_BUILD_DIR)/Rules.mak
+       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' \
        $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \

-               $(UCLIBC_DIR)/.config
-ifeq ($(BR2_LARGEFILE),y)
-       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config
+               $(PKG_BUILD_DIR)/.config
+ifeq ($(CONFIG_LARGEFILE),y)
+       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(PKG_BUILD_DIR)/.config

 else
 else

-       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config
+       $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(PKG_BUILD_DIR)/.config

 endif
 endif

-       $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
-ifeq ($(BR2_SOFT_FLOAT),y)
-       $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config
+       $(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
 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
-       $(MAKE1) -C $(UCLIBC_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/ \
                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;
                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                pregen install_dev;

-       touch $(UCLIBC_DIR)/.configured
+endef
+
+define Build/Configure
+endef

 
 

-$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET)
-       $(MAKE1) -C $(UCLIBC_DIR) \
+define Build/Compile
+       PATH=$(TARGET_PATH) $(MAKE) -j $(CONFIG_JLEVEL) -C $(PKG_BUILD_DIR) \

                PREFIX= \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                all
                PREFIX= \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                all

-       touch -c $(UCLIBC_DIR)/lib/libc.a
+endef

 
 

-$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
-       $(MAKE1) -C $(UCLIBC_DIR) \
+define Build/Install
+       $(MAKE) -C $(PKG_BUILD_DIR) \

                PREFIX=$(STAGING_DIR)/ \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_runtime
                PREFIX=$(STAGING_DIR)/ \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_runtime

-       $(MAKE1) -C $(UCLIBC_DIR) \
+       $(MAKE) -C $(PKG_BUILD_DIR) \

                PREFIX=$(STAGING_DIR)/ \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_dev
                PREFIX=$(STAGING_DIR)/ \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                install_dev

-       echo $(UCLIBC_VER) > $(STAGING_DIR)/uclibc_version
-       touch -c $(STAGING_DIR)/lib/libc.a
+       echo $(PKG_VERSION) > $(STAGING_DIR)/uclibc_version
+endef
+
+define Build/Clean
+       rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev
+endef

 
 

-source: $(DL_DIR)/$(UCLIBC_SOURCE)
-prepare: $(UCLIBC_DIR)/.configured
-compile: $(UCLIBC_DIR)/lib/libc.a
-install: $(STAGING_DIR)/lib/libc.a $(UCLIBC_TARGETS)
-clean: 
-       rm -rf $(UCLIBC_DIR) $(TOOL_BUILD_DIR)/uClibc_dev
+$(eval $(call HostBuild))