X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=toolchain%2Feglibc%2Fcommon.mk;h=f1e3f304559c151d8c027a2e6aff6c3ddde9daf7;hb=427536bc53f20f4c22a55f4ea006efd7f1ac2bcf;hp=c34c612402fd1b1073b5ca212175e91492f62559;hpb=154123a8c67ad4c5f7ece55053edc2396b9675c9;p=openwrt%2F.git diff --git a/toolchain/eglibc/common.mk b/toolchain/eglibc/common.mk index c34c612402..f1e3f30455 100644 --- a/toolchain/eglibc/common.mk +++ b/toolchain/eglibc/common.mk @@ -15,17 +15,11 @@ 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_16),) - PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_16 +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) @@ -60,6 +54,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 @@ -85,7 +80,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