ar71xx: fix image generation for TL-WR741ND/TL-WR841ND-v5

[openwrt.git] / toolchain / glibc / Makefile

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 73dbdd8..5d56d4b 100644 (file)
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -12,6 +12,9 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
 ifeq ($(PKG_VERSION),2.3.6)
   PKG_MD5SUM:=bfdce99f82d6dbcb64b7f11c05d6bc96
 endif
 ifeq ($(PKG_VERSION),2.3.6)
   PKG_MD5SUM:=bfdce99f82d6dbcb64b7f11c05d6bc96
 endif

+ifeq ($(PKG_VERSION),2.4)
+  PKG_MD5SUM:=7e9a88dcd41fbc53801dbe5bdacaf245
+endif

 ifeq ($(PKG_VERSION),2.6.1)
   PKG_MD5SUM:=11cf6d3fc86dbe0890b8d00372eb6286
 endif
 ifeq ($(PKG_VERSION),2.6.1)
   PKG_MD5SUM:=11cf6d3fc86dbe0890b8d00372eb6286
 endif


@@ -24,15 +27,10 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 
 
 PATCH_DIR:=./patches/$(PKG_VERSION)
 

-STAGING_DIR_HOST:=$(TOOLCHAIN_DIR)
-BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN)
-
-override CONFIG_AUTOREBUILD=
-
-include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/toolchain-build.mk

 
 

-STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built
-STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed
+HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built
+HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed

 
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final
 
 HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial
 HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final


@@ -57,11 +55,13 @@ GLIBC_CONFIGURE:= \
        libc_cv_forced_unwind=yes \
        libc_cv_c_cleanup=yes \
        libc_cv_386_tls=yes \
        libc_cv_forced_unwind=yes \
        libc_cv_c_cleanup=yes \
        libc_cv_386_tls=yes \

+       libc_cv_slibdir="/lib" \

        $(HOST_BUILD_DIR)/configure \
                --prefix=/usr \
                --build=$(GNU_HOST_NAME) \
                --host=$(REAL_GNU_TARGET_NAME) \
                --with-headers="$(TOOLCHAIN_DIR)/usr/include" \
        $(HOST_BUILD_DIR)/configure \
                --prefix=/usr \
                --build=$(GNU_HOST_NAME) \
                --host=$(REAL_GNU_TARGET_NAME) \
                --with-headers="$(TOOLCHAIN_DIR)/usr/include" \

+               $(if $(CONFIG_mips64)$(CONFIG_mips64el), --enable-kernel="2.6.0") \

                --disable-debug \
                --disable-profile \
                --enable-add-ons="$(GLIBC_ADD_ONS)" \
                --disable-debug \
                --disable-profile \
                --enable-add-ons="$(GLIBC_ADD_ONS)" \


@@ -92,7 +92,7 @@ define Host/SetToolchainInfo
        $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk
        $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk

-       $(SED) 's,^\(LIBC_PATCHVER\)=.*,\1=,' $(TOOLCHAIN_DIR)/info.mk
+       $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk

 endef
 
 define Stage1/Configure
 endef
 
 define Stage1/Configure