aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/glibc
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 /toolchain/glibc
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>
Diffstat (limited to 'toolchain/glibc')
-rw-r--r--toolchain/glibc/Config.in12
-rw-r--r--toolchain/glibc/Config.version11
-rw-r--r--toolchain/glibc/common.mk12
3 files changed, 3 insertions, 32 deletions
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