aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/glibc
diff options
context:
space:
mode:
authorMirko Vogt <mirko@openwrt.org>2012-04-28 22:24:12 +0000
committerMirko Vogt <mirko@openwrt.org>2012-04-28 22:24:12 +0000
commit3b19d53edd512d871709f3a3c39b7c7c9d0f8f03 (patch)
tree32178f4f4735188a13b27010dfea79fe2f1b07f4 /toolchain/glibc
parentd7efd1199d12100470dcf4e830c806bf411d0945 (diff)
downloadmaster-187ad058-3b19d53edd512d871709f3a3c39b7c7c9d0f8f03.tar.gz
master-187ad058-3b19d53edd512d871709f3a3c39b7c7c9d0f8f03.tar.bz2
master-187ad058-3b19d53edd512d871709f3a3c39b7c7c9d0f8f03.zip
[toolchain/glibc*] purge support for glibc - use eglibc instead!
for reference: http://www.mail-archive.com/openwrt-devel@lists.openwrt.org/msg13425.html git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31503 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/glibc')
-rw-r--r--toolchain/glibc/Config.in11
-rw-r--r--toolchain/glibc/Config.version11
-rw-r--r--toolchain/glibc/Makefile168
-rw-r--r--toolchain/glibc/patches/2.14/100-fix_cpuid_h_check.patch22
-rw-r--r--toolchain/glibc/patches/2.14/200-add_dl_search_path.patch12
5 files changed, 0 insertions, 224 deletions
diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in
deleted file mode 100644
index 1b87976d32..0000000000
--- a/toolchain/glibc/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-choice
- prompt "glibc version"
- depends on TOOLCHAINOPTS && USE_GLIBC
- default GLIBC_VERSION_2_14
- help
- Select the version of glibc you wish to use.
-
- config GLIBC_VERSION_2_14
- bool "glibc 2.14"
-
-endchoice
diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version
deleted file mode 100644
index 466794fa8c..0000000000
--- a/toolchain/glibc/Config.version
+++ /dev/null
@@ -1,11 +0,0 @@
-config GLIBC_VERSION
- string
- depends on USE_GLIBC
- default "2.14" if GLIBC_VERSION_2_14
- default "2.14"
-
-config GLIBC_PORTS
- bool
- depends on USE_GLIBC
- default y if GLIBC_VERSION_2_14 && (arm || armeb || mips || mipsel || mips64 || mips64el || powerpc)
- default n
diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
deleted file mode 100644
index caf4b088ea..0000000000
--- a/toolchain/glibc/Makefile
+++ /dev/null
@@ -1,168 +0,0 @@
-#
-# Copyright (C) 2006-2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=glibc
-PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
-
-ifeq ($(PKG_VERSION),2.14)
- PKG_MD5SUM:=1588cc22e796c296223744895ebc4cef
-endif
-
-PKG_SOURCE_URL:=@GNU/glibc
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-
-PATCH_DIR:=./patches/$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/toolchain-build.mk
-
-HOST_STAMP_BUILT:=$(TOOLCHAIN_DIR)/stamp/.glibc_built
-HOST_STAMP_INSTALLED:=$(TOOLCHAIN_DIR)/stamp/.glibc_installed
-
-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 Host/Prepare/ports
- ln -snf ../glibc-ports $(HOST_BUILD_DIR)/ports
- endef
-endif
-
-# XXX: {e,}glibc does not build w/ -Os
-# http://sourceware.org/bugzilla/show_bug.cgi?id=5203
-GLIBC_CFLAGS:=$(subst -Os,-O2,$(TARGET_CFLAGS))
-
-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 \
- libc_cv_slibdir="/lib" \
- $(HOST_BUILD_DIR)/configure \
- --prefix= \
- --build=$(GNU_HOST_NAME) \
- --host=$(REAL_GNU_TARGET_NAME) \
- --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)" \
- --without-gd \
- --without-cvs \
-
-ifeq ($(CONFIG_SOFT_FLOAT),)
- GLIBC_CONFIGURE+= \
- --with-fp
-else
- GLIBC_CONFIGURE+= \
- --without-fp
-endif
-
-GLIBC_CONFIGURE_STAGE1:= \
- $(GLIBC_CONFIGURE) \
- --disable-sanity-checks \
- --enable-hacker-mode \
-
-GLIBC_CONFIGURE_STAGE2:= \
- $(GLIBC_CONFIGURE) \
-
-GLIBC_MAKE:= \
- $(MAKE) \
-
-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_SO_VERSION\)=.*,\1=$(PKG_VERSION),' $(TOOLCHAIN_DIR)/info.mk
-endef
-
-define Stage1/Configure
- mkdir -p $(HOST_BUILD_DIR1)
- ( cd $(HOST_BUILD_DIR1); rm -f config.cache; \
- $(GLIBC_CONFIGURE_STAGE1) \
- );
-endef
-
-define Stage1/Compile
-endef
-
-define Stage1/Install
- $(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/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 $(HOST_BUILD_DIR2)
- ( cd $(HOST_BUILD_DIR2); rm -f config.cache; \
- $(GLIBC_CONFIGURE_STAGE2) \
- );
-endef
-
-define Stage2/Compile
- $(GLIBC_MAKE) -C $(HOST_BUILD_DIR2) all
-endef
-
-define Stage2/Install
- $(GLIBC_MAKE) -C $(HOST_BUILD_DIR2) \
- install_root="$(TOOLCHAIN_DIR)" \
- install
- ( cd $(TOOLCHAIN_DIR) ; \
- for d in lib usr/lib ; do \
- for f in libc.so libpthread.so libgcc_s.so ; do \
- if [ -f $$$$d/$$$$f -a ! -L $$$$d/$$$$f ] ; then \
- $(SED) 's,/usr/lib/,,g;s,/lib/,,g' $$$$d/$$$$f ; \
- fi \
- done \
- done \
- )
-endef
-
-define Host/Prepare
- $(call Host/SetToolchainInfo)
- $(call Host/Prepare/Default)
- ln -snf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
- $(call Host/Prepare/ports)
- $(call Stage1/Configure)
- $(call Stage1/Compile)
- $(call Stage1/Install)
-endef
-
-define Host/Configure
-endef
-
-define Host/Compile
- $(call Stage2/Configure)
- $(call Stage2/Compile)
- $(call Stage2/Install)
-endef
-
-define Host/Install
-endef
-
-define Host/Clean
- rm -rf \
- $(HOST_BUILD_DIR) \
- $(HOST_BUILD_DIR1) \
- $(HOST_BUILD_DIR2) \
- $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
- $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
-endef
-
-$(eval $(call HostBuild))
diff --git a/toolchain/glibc/patches/2.14/100-fix_cpuid_h_check.patch b/toolchain/glibc/patches/2.14/100-fix_cpuid_h_check.patch
deleted file mode 100644
index 12d0e1e996..0000000000
--- a/toolchain/glibc/patches/2.14/100-fix_cpuid_h_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/sysdeps/i386/configure.in
-+++ b/sysdeps/i386/configure.in
-@@ -2,7 +2,7 @@
- # Local configure fragment for sysdeps/i386.
-
- AC_HEADER_CHECK([cpuid.h], ,
-- [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])])
-+ [AC_MSG_ERROR([gcc must provide the <cpuid.h> header])], [])
-
- AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
- libc_cv_cpp_asm_debuginfo, [dnl
---- a/sysdeps/i386/configure
-+++ b/sysdeps/i386/configure
-@@ -632,7 +632,7 @@
- done
-
-
--ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
-+ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" ""
- if test "x$ac_cv_header_cpuid_h" = x""yes; then :
-
- else
diff --git a/toolchain/glibc/patches/2.14/200-add_dl_search_path.patch b/toolchain/glibc/patches/2.14/200-add_dl_search_path.patch
deleted file mode 100644
index 2f4a48f201..0000000000
--- a/toolchain/glibc/patches/2.14/200-add_dl_search_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -529,6 +529,9 @@
- default-rpath = $(libdir)
- endif
-
-+# Add /usr/lib to default search path for the dynamic linker
-+user-defined-trusted-dirs := /usr/lib
-+
- ifndef link-extra-libs
- link-extra-libs = $(LDLIBS-$(@F))
- link-extra-libs-static = $(link-extra-libs)