X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9..5362dd1b5a8b234e6427221e7d46d66ce7b69849:/toolchain/eglibc/Makefile?ds=inline diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index dff7e4852..b72b4bd35 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -15,19 +15,22 @@ 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_TRUNK),) PKG_SOURCE_URL:=svn://svn.eglibc.org/trunk endif @@ -51,6 +54,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) \