Browse Source

only support latest C library version, this is the best tested one

Waldemar Brodkorb 7 years ago
parent
commit
7980ad76c8

+ 2 - 49
target/config/Config.in.libc

@@ -72,7 +72,6 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_TARGET_ARCH_MIPS || \
 		ADK_TARGET_ARCH_MIPS64 || \
 		ADK_TARGET_ARCH_NIOS2 || \
-		ADK_TARGET_ARCH_OR1K || \
 		ADK_TARGET_ARCH_PPC || \
 		ADK_TARGET_ARCH_PPC64 || \
 		ADK_TARGET_ARCH_S390 || \
@@ -132,51 +131,22 @@ config ADK_TARGET_LIB_UCLIBC_NG_1_0_20
 	bool "1.0.20"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_19
-	bool "1.0.19"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_18
-	bool "1.0.18"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
 config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
 config ADK_TARGET_LIB_GLIBC_2_24
 	bool "2.24"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K
-
-config ADK_TARGET_LIB_GLIBC_2_23
-	bool "2.23"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K
-
-config ADK_TARGET_LIB_GLIBC_2_22
-	bool "2.22"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA \
-					&& !ADK_TARGET_ARCH_OR1K
-
-config ADK_TARGET_LIB_GLIBC_OR1K
-	bool "2.20-or1k"
-	depends on ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_OR1K
+	depends on ADK_TARGET_LIB_GLIBC
 
 config ADK_TARGET_LIB_GLIBC_GIT
 	bool "git"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_OR1K
+	depends on ADK_TARGET_LIB_GLIBC
 
 config ADK_TARGET_LIB_MUSL_1_1_15
 	bool "1.1.15"
 	depends on ADK_TARGET_LIB_MUSL
 
-config ADK_TARGET_LIB_MUSL_1_1_14
-	bool "1.1.14"
-	depends on ADK_TARGET_LIB_MUSL
-
-config ADK_TARGET_LIB_MUSL_1_1_13
-	bool "1.1.13"
-	depends on ADK_TARGET_LIB_MUSL
-
 config ADK_TARGET_LIB_MUSL_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_MUSL
@@ -185,14 +155,6 @@ config ADK_TARGET_LIB_NEWLIB_2_4_0
 	bool "2.4.0"
 	depends on ADK_TARGET_LIB_NEWLIB
 
-config ADK_TARGET_LIB_NEWLIB_2_3_0
-	bool "2.3.0"
-	depends on ADK_TARGET_LIB_NEWLIB
-
-config ADK_TARGET_LIB_NEWLIB_2_2_0
-	bool "2.2.0"
-	depends on ADK_TARGET_LIB_NEWLIB
-
 config ADK_TARGET_LIB_NEWLIB_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_NEWLIB
@@ -235,18 +197,9 @@ config ADK_TARGET_LIBC
 config ADK_LIBC_VERSION
 	string
 	default "1.0.20" if ADK_TARGET_LIB_UCLIBC_NG_1_0_20
-	default "1.0.19" if ADK_TARGET_LIB_UCLIBC_NG_1_0_19
-	default "1.0.18" if ADK_TARGET_LIB_UCLIBC_NG_1_0_18
 	default "1.1.15" if ADK_TARGET_LIB_MUSL_1_1_15
-	default "1.1.14" if ADK_TARGET_LIB_MUSL_1_1_14
-	default "1.1.13" if ADK_TARGET_LIB_MUSL_1_1_13
 	default "2.23" if ADK_TARGET_LIB_GLIBC_2_23
-	default "2.22" if ADK_TARGET_LIB_GLIBC_2_22
-	default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
-	default "2.20-or1k" if ADK_TARGET_LIB_GLIBC_OR1K
 	default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0
-	default "2.3.0" if ADK_TARGET_LIB_NEWLIB_2_3_0
-	default "2.2.0" if ADK_TARGET_LIB_NEWLIB_2_2_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \
 		         ADK_TARGET_LIB_GLIBC_GIT || \

+ 1 - 18
toolchain/glibc/Makefile.inc

@@ -3,7 +3,7 @@
 
 PKG_NAME:=		glibc
 ifeq ($(ADK_LIBC_VERSION),git)
-PKG_VERSION:=		2.23.90
+PKG_VERSION:=		2.24.90
 PKG_SITES:=		git://sourceware.org/git/glibc.git
 PKG_RELEASE:=		1
 endif
@@ -13,21 +13,4 @@ PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 PKG_RELEASE:=		1
 PKG_HASH:=		99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3
 endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_23),y)
-PKG_VERSION:=		2.23
-PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-PKG_RELEASE:=		1
-PKG_HASH:=		94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9
-endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_2_22),y)
-PKG_VERSION:=		2.22
-PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
-PKG_RELEASE:=		1
-PKG_HASH:=		eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948
-endif
-ifeq ($(ADK_TARGET_LIB_GLIBC_OR1K),y)
-PKG_VERSION:=		2.19.90
-PKG_SITES:=		https://github.com/bluecmd/or1k-glibc.git
-PKG_RELEASE:=		1
-endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz

+ 0 - 14
toolchain/musl/Makefile.inc

@@ -15,17 +15,3 @@ PKG_HASH:=		97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa
 PKG_SITES:=		http://www.musl-libc.org/releases/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TARGET_LIB_MUSL_1_1_14),y)
-PKG_VERSION:=		1.1.14
-PKG_RELEASE:=		1
-PKG_HASH:=		35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5
-PKG_SITES:=		http://www.musl-libc.org/releases/
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-endif
-ifeq ($(ADK_TARGET_LIB_MUSL_1_1_13),y)
-PKG_VERSION:=		1.1.13
-PKG_RELEASE:=		1
-PKG_HASH:=		bbacdc64f557d0c4857f7d2daf592c32c29aec1babbb94fcf01a2e05bed15013
-PKG_SITES:=		http://www.musl-libc.org/releases/
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-endif

+ 0 - 14
toolchain/newlib/Makefile.inc

@@ -15,17 +15,3 @@ PKG_HASH:=		545b3d235e350d2c61491df8b9f775b1b972f191380db8f52ec0b1c829c52706
 PKG_SITES:=		ftp://sourceware.org/pub/newlib/
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TARGET_LIB_NEWLIB_2_3_0),y)
-PKG_VERSION:=		2.3.0.20160226
-PKG_RELEASE:=		1
-PKG_HASH:=		a9489dd28276e4fb29d65a1388a359b1f005d2ba6a4b92a6e5a802b95e1ad7d1
-PKG_SITES:=		ftp://sourceware.org/pub/newlib/
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-endif
-ifeq ($(ADK_TARGET_LIB_NEWLIB_2_2_0),y)
-PKG_VERSION:=		2.2.0.20151023
-PKG_RELEASE:=		1
-PKG_HASH:=		fd1d3d358dd66922f37563518e787196e1fba8adaa6d8b1e955d145b38b3fa60
-PKG_SITES:=		ftp://sourceware.org/pub/newlib/
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-endif

+ 0 - 12
toolchain/uclibc-ng/Makefile.inc

@@ -13,16 +13,4 @@ PKG_RELEASE:=		1
 PKG_SITES:=		http://downloads.uclibc-ng.org/releases/1.0.20/
 PKG_HASH:=		1c817672a65cf9132c98f84e1b8445650de1c18eca258f49c0050b420a25e946
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_19),y)
-PKG_VERSION:=		1.0.19
-PKG_RELEASE:=		1
-PKG_SITES:=		http://downloads.uclibc-ng.org/releases/1.0.19/
-PKG_HASH:=		b3f94d67e9afcefb158a37011584e0d41ef3bd55ad72255a26abb25ad49b77a1
-endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_18),y)
-PKG_VERSION:=		1.0.18
-PKG_RELEASE:=		1
-PKG_SITES:=		http://downloads.uclibc-ng.org/releases/1.0.18/
-PKG_HASH:=		5430bb3acde31d70db906be33e3e2a022beba42b50f2c56695d37344560e253f
-endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz