X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3f577f4c40ad8db410405ba37782f51c853fe65d..f0f8408f2055746841c2484ea69b7352a2231ba2:/toolchain/glibc/Makefile?ds=sidebyside

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index d014cacde..789ae842d 100644
--- 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.4)
+  PKG_MD5SUM:=7e9a88dcd41fbc53801dbe5bdacaf245
+endif
 ifeq ($(PKG_VERSION),2.6.1)
   PKG_MD5SUM:=11cf6d3fc86dbe0890b8d00372eb6286
 endif
@@ -52,11 +55,13 @@ GLIBC_CONFIGURE:= \
 	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 \
+		--prefix= \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(REAL_GNU_TARGET_NAME) \
-		--with-headers="$(TOOLCHAIN_DIR)/usr/include" \
+		--with-headers="$(TOOLCHAIN_DIR)/include" \
+		$(if $(CONFIG_mips64)$(CONFIG_mips64el), --enable-kernel="2.6.0") \
 		--disable-debug \
 		--disable-profile \
 		--enable-add-ons="$(GLIBC_ADD_ONS)" \
@@ -87,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_PATCHVER\)=.*,\1=,' $(TOOLCHAIN_DIR)/info.mk
+	$(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
 endef
 
 define Stage1/Configure
@@ -106,11 +111,11 @@ define Stage1/Install
 		cross-compiling=yes \
 		install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \
 		install-headers
-	[ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h ] || \
+	[ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h ] || \
 		$(CP) $(HOST_BUILD_DIR1)/bits/stdio_lim.h \
-			$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h
-	[ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h ] || \
-		touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h
+			$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h
+	[ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h ] || \
+		touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h
 endef
 
 define Stage2/Configure