X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3f577f4c40ad8db410405ba37782f51c853fe65d..249a5e63b3cc178feff1a91ebfc4b3dcfd1dab0e:/toolchain/eglibc/Makefile?ds=inline diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index bc2a6bc7d..822309d05 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -15,19 +15,25 @@ PKG_SOURCE_VERSION:=$(PKG_REVISION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2 -ifeq ($(PKG_VERSION),2.6.1) +ifneq ($(CONFIG_EGLIBC_VERSION_2_6),) PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_6 endif -ifeq ($(PKG_VERSION),2.7) +ifneq ($(CONFIG_EGLIBC_VERSION_2_7),) PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_7 endif -ifeq ($(PKG_VERSION),2.8) +ifneq ($(CONFIG_EGLIBC_VERSION_2_8),) PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_8 endif -ifeq ($(PKG_VERSION),2.9) +ifneq ($(CONFIG_EGLIBC_VERSION_2_9),) PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_9 endif -ifeq ($(PKG_VERSION),trunk) +ifneq ($(CONFIG_EGLIBC_VERSION_2_10),) + PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_10 +endif +ifneq ($(CONFIG_EGLIBC_VERSION_2_11),) + PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_11 +endif +ifneq ($(CONFIG_EGLIBC_VERSION_TRUNK),) PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk endif @@ -51,6 +57,7 @@ EGLIBC_CONFIGURE:= \ BUILD_CC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(EGLIBC_CFLAGS)" \ + libc_cv_slibdir="/lib" \ $(HOST_BUILD_DIR)/libc/configure \ --prefix=/usr \ --build=$(GNU_HOST_NAME) \ @@ -77,7 +84,7 @@ define Host/SetToolchainInfo $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.eglibc.org/,' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,^\(LIBC_PATCHVER\)=.*,\1=$(PKG_EXTRAVERSION),' $(TOOLCHAIN_DIR)/info.mk + $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk endef define Stage1/Configure