aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-07 10:38:47 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-11 15:37:55 +0100
commit38fcd2a865c2ec463b6909f613847d41353c1e1e (patch)
tree59875ded514a856eb373a8ad56e9139a5d8ded45
parent73ea3c3f9c45d28b2309342ad358ab6b46365aa6 (diff)
downloadupstream-38fcd2a865c2ec463b6909f613847d41353c1e1e.tar.gz
upstream-38fcd2a865c2ec463b6909f613847d41353c1e1e.tar.bz2
upstream-38fcd2a865c2ec463b6909f613847d41353c1e1e.zip
build: remove libc version config code
We only support one version per libc type Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--toolchain/Config.in11
-rw-r--r--toolchain/glibc/Config.in12
-rw-r--r--toolchain/glibc/Config.version11
-rw-r--r--toolchain/glibc/common.mk12
-rw-r--r--toolchain/musl/Config.version8
-rw-r--r--toolchain/musl/common.mk2
-rw-r--r--toolchain/uClibc/Config.version9
-rw-r--r--toolchain/uClibc/common.mk2
8 files changed, 5 insertions, 62 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index b53b8e63ec..cb645877de 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -263,7 +263,6 @@ choice
endchoice
-source "toolchain/glibc/Config.in"
source "toolchain/uClibc/Config.in"
comment "Debuggers"
@@ -303,22 +302,12 @@ config USE_EXTERNAL_LIBC
source "toolchain/binutils/Config.version"
source "toolchain/gcc/Config.version"
-source "toolchain/glibc/Config.version"
-source "toolchain/uClibc/Config.version"
-source "toolchain/musl/Config.version"
-
config LIBC
string
default "glibc" if USE_GLIBC
default "uClibc" if USE_UCLIBC
default "musl" if USE_MUSL
-config LIBC_VERSION
- string
- default GLIBC_VERSION if USE_GLIBC
- default UCLIBC_VERSION if USE_UCLIBC
- default MUSL_VERSION if USE_MUSL
-
config TARGET_SUFFIX
string
default "gnueabi" if USE_GLIBC && (arm || armeb)
diff --git a/toolchain/glibc/Config.in b/toolchain/glibc/Config.in
deleted file mode 100644
index 5adbeb6f82..0000000000
--- a/toolchain/glibc/Config.in
+++ /dev/null
@@ -1,12 +0,0 @@
-choice
- prompt "glibc version"
- depends on TOOLCHAINOPTS && USE_GLIBC && !EXTERNAL_TOOLCHAIN
- default GLIBC_USE_VERSION_2_24
- help
- Select the version of glibc you wish to use.
-
- config GLIBC_USE_VERSION_2_24
- bool "glibc 2.24"
- select GLIBC_VERSION_2_24
-
-endchoice
diff --git a/toolchain/glibc/Config.version b/toolchain/glibc/Config.version
deleted file mode 100644
index 1df7719ac8..0000000000
--- a/toolchain/glibc/Config.version
+++ /dev/null
@@ -1,11 +0,0 @@
-if USE_GLIBC
-
-config GLIBC_VERSION
- string
- default "2.24" if GLIBC_VERSION_2_24
-
-config GLIBC_VERSION_2_24
- default y if !TOOLCHAINOPTS
- bool
-
-endif
diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 3078c267cc..12666ac6ff 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -6,16 +6,10 @@
#
include $(TOPDIR)/rules.mk
-
-HASH_2.24 = 714d26c0daf6a8acf73fc8b6053349880c79f240f96ca57b00ab0ecbbead2b73
-REVISION_2.24 = 8c716c2
-
-
PKG_NAME:=glibc
-PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION))
-
-PKG_REVISION:=$(REVISION_$(PKG_VERSION))
-PKG_MIRROR_HASH:=$(HASH_$(PKG_VERSION))
+PKG_VERSION:=2.24
+PKG_REVISION:=8c716c2
+PKG_MIRROR_HASH:=714d26c0daf6a8acf73fc8b6053349880c79f240f96ca57b00ab0ecbbead2b73
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git
diff --git a/toolchain/musl/Config.version b/toolchain/musl/Config.version
deleted file mode 100644
index 2b4b367d97..0000000000
--- a/toolchain/musl/Config.version
+++ /dev/null
@@ -1,8 +0,0 @@
-if USE_MUSL
-
-config MUSL_VERSION
- string
- depends on USE_MUSL
- default "1.1.16"
-
-endif
diff --git a/toolchain/musl/common.mk b/toolchain/musl/common.mk
index bfe8eebc7b..fc6253b5f9 100644
--- a/toolchain/musl/common.mk
+++ b/toolchain/musl/common.mk
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
PKG_NAME:=musl
-PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION))
+PKG_VERSION:=1.1.16
PKG_RELEASE=1
PKG_SOURCE_PROTO:=git
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
deleted file mode 100644
index 3c1c54d61e..0000000000
--- a/toolchain/uClibc/Config.version
+++ /dev/null
@@ -1,9 +0,0 @@
-config UCLIBC_VERSION
- string
- depends on USE_UCLIBC
- default "1.0.14"
-
-config UCLIBC_VERSION_NG
- bool
- depends on USE_UCLIBC
- default y
diff --git a/toolchain/uClibc/common.mk b/toolchain/uClibc/common.mk
index 35f4f80854..efcbde8f02 100644
--- a/toolchain/uClibc/common.mk
+++ b/toolchain/uClibc/common.mk
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk
-PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
+PKG_VERSION:=1.0.14
PKG_NAME:=uClibc-ng
PKG_SOURCE_URL = http://downloads.uclibc-ng.org/releases/$(PKG_VERSION)/