X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/800e84cc0ff36cfbc254ec9681d8731a4fd480f1..5362dd1b5a8b234e6427221e7d46d66ce7b69849:/toolchain/eglibc/Makefile?ds=inline diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index 4eabbbfe6..b72b4bd35 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -15,34 +15,33 @@ 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 PATCH_DIR:=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR) - -override CONFIG_AUTOREBUILD= +HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(PKG_SOURCE_SUBDIR) -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk -STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built -STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed +HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.eglibc_built +HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.eglibc_installed HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final @@ -55,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) \ @@ -81,7 +81,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