domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove libc version config code

Browse Source 
We only support one version per libc type

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2017-02-07 10:38:47 +01:00
parent 73ea3c3f9c
commit 38fcd2a865
8 changed files with 5 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
toolchain/Config.in
View File

@@ -263,7 +263,6 @@ choice
endchoice endchoice
source "toolchain/glibc/Config.in"
source "toolchain/uClibc/Config.in" source "toolchain/uClibc/Config.in"
comment "Debuggers" comment "Debuggers"
@@ -303,22 +302,12 @@ config USE_EXTERNAL_LIBC
source "toolchain/binutils/Config.version" source "toolchain/binutils/Config.version"
source "toolchain/gcc/Config.version" source "toolchain/gcc/Config.version"
source "toolchain/glibc/Config.version"
source "toolchain/uClibc/Config.version"
source "toolchain/musl/Config.version"
config LIBC config LIBC
string string
default "glibc" if USE_GLIBC default "glibc" if USE_GLIBC
default "uClibc" if USE_UCLIBC default "uClibc" if USE_UCLIBC
default "musl" if USE_MUSL 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 config TARGET_SUFFIX
string string
default "gnueabi" if USE_GLIBC && (arm || armeb) default "gnueabi" if USE_GLIBC && (arm || armeb)

12
toolchain/glibc/Config.in
View File

@@ -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

11
toolchain/glibc/Config.version
View File

@@ -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

12
toolchain/glibc/common.mk
View File

@@ -6,16 +6,10 @@
# #
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
HASH_2.24 = 714d26c0daf6a8acf73fc8b6053349880c79f240f96ca57b00ab0ecbbead2b73
REVISION_2.24 = 8c716c2
PKG_NAME:=glibc PKG_NAME:=glibc
PKG_VERSION:=$(call qstrip,$(CONFIG_GLIBC_VERSION)) PKG_VERSION:=2.24
PKG_REVISION:=8c716c2
PKG_REVISION:=$(REVISION_$(PKG_VERSION)) PKG_MIRROR_HASH:=714d26c0daf6a8acf73fc8b6053349880c79f240f96ca57b00ab0ecbbead2b73
PKG_MIRROR_HASH:=$(HASH_$(PKG_VERSION))
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git PKG_SOURCE_URL:=git://sourceware.org/git/glibc.git

8
toolchain/musl/Config.version
View File

@@ -1,8 +0,0 @@
if USE_MUSL
config MUSL_VERSION
string
depends on USE_MUSL
default "1.1.16"
endif

2
toolchain/musl/common.mk
View File

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
PKG_NAME:=musl PKG_NAME:=musl
PKG_VERSION:=$(call qstrip,$(CONFIG_MUSL_VERSION)) PKG_VERSION:=1.1.16
PKG_RELEASE=1 PKG_RELEASE=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

9
toolchain/uClibc/Config.version
View File

@@ -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

2
toolchain/uClibc/common.mk
View File

@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk include $(INCLUDE_DIR)/target.mk
PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION)) PKG_VERSION:=1.0.14
PKG_NAME:=uClibc-ng PKG_NAME:=uClibc-ng
PKG_SOURCE_URL = http://downloads.uclibc-ng.org/releases/$(PKG_VERSION)/ PKG_SOURCE_URL = http://downloads.uclibc-ng.org/releases/$(PKG_VERSION)/