Skip to content

Commit

Permalink
[toolchain/glibc*] purge support for glibc - use eglibc instead!
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mirko committed Apr 28, 2012
1 parent 55d4e79 commit 875ce0b
Show file tree
Hide file tree
Showing 20 changed files with 5 additions and 426 deletions.
8 changes: 2 additions & 6 deletions package/base-files/Makefile
Expand Up @@ -516,8 +516,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
use_libnsl=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NIS),libnsl)
use_nsswitch=$(if $(CONFIG_USE_GLIBC)$(CONFIG_EGLIBC_OPTION_EGLIBC_NSSWITCH),libnss_dns libnss_files)

define Package/glibc/install
$(CP) ./glibc-files/* $(1)/
define Package/eglibc/install
$(CP) ./eglibc-files/* $(1)/
rm -f $(1)/etc/localtime
ln -sf /tmp/localtime $(1)/etc/localtime
$(INSTALL_DIR) $(1)/lib
Expand All @@ -534,10 +534,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
done
endef

define Package/eglibc/install
$(call Package/glibc/install,$1)
endef

define Package/uClibc/install
$(INSTALL_DIR) $(1)/lib
$(CP) \
Expand Down
12 changes: 2 additions & 10 deletions toolchain/Config.in
Expand Up @@ -142,17 +142,12 @@ choice
bool "Use eglibc"
depends !avr32

config USE_GLIBC
bool "Use glibc"
depends !avr32

config USE_UCLIBC
bool "Use uClibc"

endchoice

source "toolchain/eglibc/Config.in"
source "toolchain/glibc/Config.in"
source "toolchain/uClibc/Config.in"

comment "Debuggers"
Expand Down Expand Up @@ -185,24 +180,21 @@ config USE_EXTERNAL_LIBC
source "toolchain/gcc/Config.version"

source "toolchain/eglibc/Config.version"
source "toolchain/glibc/Config.version"
source "toolchain/uClibc/Config.version"

config LIBC
string
default "eglibc" if USE_EGLIBC
default "glibc" if USE_GLIBC
default "uClibc" if USE_UCLIBC

config LIBC_VERSION
string
default EGLIBC_VERSION if USE_EGLIBC
default GLIBC_VERSION if USE_GLIBC
default UCLIBC_VERSION if USE_UCLIBC

config TARGET_SUFFIX
string
default "gnueabi" if (USE_EGLIBC || USE_GLIBC) && (arm || armeb)
default "gnu" if (USE_EGLIBC || USE_GLIBC) && !(arm || armeb)
default "gnueabi" if (USE_EGLIBC) && (arm || armeb)
default "gnu" if (USE_EGLIBC) && !(arm || armeb)
default "uclibcgnueabi" if USE_UCLIBC && (arm || armeb)
default "uclibc" if USE_UCLIBC && !(arm || armeb)
5 changes: 1 addition & 4 deletions toolchain/Makefile
Expand Up @@ -28,7 +28,7 @@
curdir:=toolchain

# subdirectories to descend into
$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC) $(if $(CONFIG_GLIBC_PORTS),glibc-ports))
$(curdir)/builddirs := $(if $(CONFIG_GDB),gdb) $(if $(CONFIG_INSIGHT),insight) $(if $(CONFIG_EXTERNAL_TOOLCHAIN),wrapper,kernel-headers binutils gcc/minimal gcc/initial gcc/final $(LIBC))
$(curdir)/builddirs-compile:=$($(curdir)/builddirs-prepare)
$(curdir)/builddirs-install:=$($(curdir)/builddirs-compile)

Expand All @@ -43,9 +43,6 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(curdir)/$(LIBC)/compile:=$(curdir)/gcc/initial/install
$(curdir)/gcc/final/compile:=$(curdir)/$(LIBC)/compile
$(curdir)/$(LIBC)/install:=$(curdir)/gcc/final/install
ifneq ($(CONFIG_GLIBC_PORTS),)
$(curdir)/glibc/prepare:=$(curdir)/glibc-ports/prepare
endif
endif

ifdef CONFIG_GCC_VERSION_LLVM
Expand Down
52 changes: 0 additions & 52 deletions toolchain/glibc-ports/Makefile

This file was deleted.

7 changes: 0 additions & 7 deletions toolchain/glibc-ports/patches/2.4/100-mips-fork.patch

This file was deleted.

13 changes: 0 additions & 13 deletions toolchain/glibc-ports/patches/2.6.1/101-arm_asm_page_h.patch

This file was deleted.

13 changes: 0 additions & 13 deletions toolchain/glibc-ports/patches/2.6.1/102-arm_nptl.patch

This file was deleted.

This file was deleted.

21 changes: 0 additions & 21 deletions toolchain/glibc-ports/patches/2.6.1/603-powerpc-softfloat.patch

This file was deleted.

13 changes: 0 additions & 13 deletions toolchain/glibc-ports/patches/2.7/101-arm_asm_page_h.patch

This file was deleted.

13 changes: 0 additions & 13 deletions toolchain/glibc-ports/patches/2.7/102-arm_nptl.patch

This file was deleted.

15 changes: 0 additions & 15 deletions toolchain/glibc-ports/patches/2.7/103-arm_nptl_cargs6.patch

This file was deleted.

13 changes: 0 additions & 13 deletions toolchain/glibc-ports/patches/2.7/104-arm_nptl_lowlevellock.patch

This file was deleted.

This file was deleted.

11 changes: 0 additions & 11 deletions toolchain/glibc/Config.in

This file was deleted.

11 changes: 0 additions & 11 deletions toolchain/glibc/Config.version

This file was deleted.

0 comments on commit 875ce0b

Please sign in to comment.