X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Feglibc%2Fcommon.mk;h=9ef92c6667af0f4e80189e997396638f25de43c6;hb=d923104149d82332c0c457bb0a3eaa6d19d61fa9;hp=9f7916ee7a3b706fa2a4a996f10ac9e3e0a06b2b;hpb=5d19a38d8008411f06b8beb265d94890690f562b;p=openwrt%2F.git

diff --git a/toolchain/eglibc/common.mk b/toolchain/eglibc/common.mk
index 9f7916ee7a..9ef92c6667 100644
--- a/toolchain/eglibc/common.mk
+++ b/toolchain/eglibc/common.mk
@@ -15,15 +15,12 @@ PKG_SOURCE_VERSION:=$(PKG_REVISION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
 
-ifneq ($(CONFIG_EGLIBC_VERSION_2_13),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_13
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_14),)
-  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_14
-endif
 ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
   PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15
 endif
+ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
+  PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_19
+endif
 
 PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
 
@@ -37,6 +34,17 @@ HOST_STAMP_CONFIGURED:=$(CUR_BUILD_DIR)/.configured
 HOST_STAMP_BUILT:=$(CUR_BUILD_DIR)/.built
 HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_$(VARIANT)_installed
 
+ifeq ($(ARCH),mips64)
+  ifdef CONFIG_MIPS64_ABI_N64
+    TARGET_CFLAGS += -mabi=64
+  endif
+  ifdef CONFIG_MIPS64_ABI_N32
+    TARGET_CFLAGS += -mabi=n32
+  endif
+  ifdef CONFIG_MIPS64_ABI_O32
+    TARGET_CFLAGS += -mabi=32
+  endif
+endif
 
 EGLIBC_CONFIGURE:= \
 	BUILD_CC="$(HOSTCC)" \
@@ -57,6 +65,7 @@ EGLIBC_CONFIGURE:= \
 
 export libc_cv_ssp=no
 export ac_cv_header_cpuid_h=yes
+export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include
 
 define Host/SetToolchainInfo
 	$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
@@ -82,7 +91,9 @@ define Host/Prepare
 	$(call Host/Prepare/Default)
 	ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
 	$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
+ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
 	ln -sf ../ports $(HOST_BUILD_DIR)/libc/
+endif
 endef
 
 define Host/Clean