X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3c59f418996d48f4df202e480a34f32c90f8ee5..293af18664fd175403e2fe79688c9d4860798e92:/toolchain/glibc/Makefile?ds=sidebyside diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index fd6acc46b..789ae842d 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -12,6 +12,9 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) ifeq ($(PKG_VERSION),2.3.6) PKG_MD5SUM:=bfdce99f82d6dbcb64b7f11c05d6bc96 endif +ifeq ($(PKG_VERSION),2.4) + PKG_MD5SUM:=7e9a88dcd41fbc53801dbe5bdacaf245 +endif ifeq ($(PKG_VERSION),2.6.1) PKG_MD5SUM:=11cf6d3fc86dbe0890b8d00372eb6286 endif @@ -21,29 +24,23 @@ endif PKG_SOURCE_URL:=@GNU/glibc/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_CAT:=bzcat PATCH_DIR:=./patches/$(PKG_VERSION) -STAGING_DIR_HOST:=$(TOOLCHAIN_DIR) -BUILD_DIR_HOST:=$(BUILD_DIR_TOOLCHAIN) - -override CONFIG_AUTOREBUILD= - -include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/toolchain-build.mk -STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built -STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed +HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built +HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed -PKG_BUILD_DIR1:=$(PKG_BUILD_DIR)-initial -PKG_BUILD_DIR2:=$(PKG_BUILD_DIR)-final +HOST_BUILD_DIR1:=$(HOST_BUILD_DIR)-initial +HOST_BUILD_DIR2:=$(HOST_BUILD_DIR)-final GLIBC_ADD_ONS+=nptl, ifneq ($(CONFIG_GLIBC_PORTS),) GLIBC_ADD_ONS+=ports, - define Build/Prepare/ports - ln -snf ../glibc-ports $(PKG_BUILD_DIR)/ports + define Host/Prepare/ports + ln -snf ../glibc-ports $(HOST_BUILD_DIR)/ports endef endif @@ -51,18 +48,20 @@ endif # http://sourceware.org/bugzilla/show_bug.cgi?id=5203 GLIBC_CFLAGS:=$(subst -Os,-O2,$(TARGET_CFLAGS)) -GLIBC_CONFIGURE_COMMON:= \ +GLIBC_CONFIGURE:= \ BUILD_CC="$(HOSTCC)" \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(GLIBC_CFLAGS)" \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ libc_cv_386_tls=yes \ - $(PKG_BUILD_DIR)/configure \ - --prefix=/usr \ + libc_cv_slibdir="/lib" \ + $(HOST_BUILD_DIR)/configure \ + --prefix= \ --build=$(GNU_HOST_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ - --with-headers="$(TOOLCHAIN_DIR)/usr/include" \ + --with-headers="$(TOOLCHAIN_DIR)/include" \ + $(if $(CONFIG_mips64)$(CONFIG_mips64el), --enable-kernel="2.6.0") \ --disable-debug \ --disable-profile \ --enable-add-ons="$(GLIBC_ADD_ONS)" \ @@ -70,35 +69,35 @@ GLIBC_CONFIGURE_COMMON:= \ --without-cvs \ ifeq ($(CONFIG_SOFT_FLOAT),) - GLIBC_CONFIGURE_COMMON+= \ + GLIBC_CONFIGURE+= \ --with-fp else - GLIBC_CONFIGURE_COMMON+= \ + GLIBC_CONFIGURE+= \ --without-fp endif GLIBC_CONFIGURE_STAGE1:= \ - $(GLIBC_CONFIGURE_COMMON) \ + $(GLIBC_CONFIGURE) \ --disable-sanity-checks \ --enable-hacker-mode \ GLIBC_CONFIGURE_STAGE2:= \ - $(GLIBC_CONFIGURE_COMMON) \ + $(GLIBC_CONFIGURE) \ GLIBC_MAKE:= \ $(MAKE) \ -define Build/SetToolchainInfo +define Host/SetToolchainInfo $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,^\(LIBC_URL\)=.*,\1=http://www.gnu.org/software/libc/,' $(TOOLCHAIN_DIR)/info.mk $(SED) 's,^\(LIBC_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk - $(SED) 's,^\(LIBC_PATCHVER\)=.*,\1=,' $(TOOLCHAIN_DIR)/info.mk + $(SED) 's,^\(LIBC_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk endef define Stage1/Configure - mkdir -p $(PKG_BUILD_DIR1) - ( cd $(PKG_BUILD_DIR1); rm -f config.cache; \ + mkdir -p $(HOST_BUILD_DIR1) + ( cd $(HOST_BUILD_DIR1); rm -f config.cache; \ $(GLIBC_CONFIGURE_STAGE1) \ ); endef @@ -107,31 +106,31 @@ define Stage1/Compile endef define Stage1/Install - $(GLIBC_MAKE) -C $(PKG_BUILD_DIR1) \ + $(GLIBC_MAKE) -C $(HOST_BUILD_DIR1) \ CFLAGS="-DBOOTSTRAP_GCC" \ cross-compiling=yes \ install_root="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev" \ install-headers - [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h ] || \ - $(CP) $(PKG_BUILD_DIR1)/bits/stdio_lim.h \ - $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/bits/stdio_lim.h - [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h ] || \ - touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/usr/include/gnu/stubs.h + [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h ] || \ + $(CP) $(HOST_BUILD_DIR1)/bits/stdio_lim.h \ + $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/bits/stdio_lim.h + [ -f $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h ] || \ + touch $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/include/gnu/stubs.h endef define Stage2/Configure - mkdir -p $(PKG_BUILD_DIR2) - ( cd $(PKG_BUILD_DIR2); rm -f config.cache; \ + mkdir -p $(HOST_BUILD_DIR2) + ( cd $(HOST_BUILD_DIR2); rm -f config.cache; \ $(GLIBC_CONFIGURE_STAGE2) \ ); endef define Stage2/Compile - $(GLIBC_MAKE) -C $(PKG_BUILD_DIR2) all + $(GLIBC_MAKE) -C $(HOST_BUILD_DIR2) all endef define Stage2/Install - $(GLIBC_MAKE) -C $(PKG_BUILD_DIR2) \ + $(GLIBC_MAKE) -C $(HOST_BUILD_DIR2) \ install_root="$(TOOLCHAIN_DIR)" \ install ( cd $(TOOLCHAIN_DIR) ; \ @@ -145,33 +144,33 @@ define Stage2/Install ) endef -define Build/Prepare - $(call Build/SetToolchainInfo) - $(call Build/Prepare/Default) +define Host/Prepare + $(call Host/SetToolchainInfo) + $(call Host/Prepare/Default) ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) - $(call Build/Prepare/ports) + $(call Host/Prepare/ports) $(call Stage1/Configure) $(call Stage1/Compile) $(call Stage1/Install) endef -define Build/Configure +define Host/Configure endef -define Build/Compile +define Host/Compile $(call Stage2/Configure) $(call Stage2/Compile) $(call Stage2/Install) endef -define Build/Install +define Host/Install endef -define Build/Clean +define Host/Clean rm -rf \ - $(PKG_BUILD_DIR) \ - $(PKG_BUILD_DIR1) \ - $(PKG_BUILD_DIR2) \ + $(HOST_BUILD_DIR) \ + $(HOST_BUILD_DIR1) \ + $(HOST_BUILD_DIR2) \ $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \ $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME) endef