Skip to contentSkip to conversation

glibc: drop redundant arch depends

PATCH Superseded Gustavo Zacarias 2 participants 4 messages May 22, 2014 – May 31, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/3 glibc: drop redundant arch depends

These are already in toolchain/toolchain-buildroot/Config.in and since package/glibc/Config.in is filtered by BR2_TOOLCHAIN_USES_GLIBC there's no need to duplicate this.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/glibc/Config.in | 6 ------
 1 file changed, 6 deletions(-)
package/glibc/Config.in +0 -6
index 693a33e..1c1d5e5 100644
@@ -3,12 +3,6 @@ if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 choice
 	prompt "glibc version"
 	default BR2_GLIBC_VERSION_2_18
-	# Architectures supported in mainline glibc
-	depends on BR2_arm    || BR2_armeb    || BR2_aarch64 || \
-		   BR2_i386   || BR2_mips     || BR2_mipsel  || \
-		   BR2_mips64 || BR2_mips64el || BR2_powerpc || \
-		   BR2_sh     || BR2_sh64     || BR2_sparc   || \
-		   BR2_x86_64 || BR2_microblaze
 
 config BR2_GLIBC_VERSION_2_18
        bool "2.18"
Signature · 1 line
1.8.5.5
author
#1 lore raw

PATCH 2/3 glibc: doesn't build for PowerPC SPE

Signed-off-by Gustavo Zacarias <[email protected]>
---
 toolchain/toolchain-buildroot/Config.in | 1 +
 1 file changed, 1 insertion(+)
toolchain/toolchain-buildroot/Config.in +1 -0
index 216f9db..0d34f1d 100644
@@ -66,6 +66,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 		   BR2_x86_64 || BR2_microblaze
 	depends on BR2_USE_MMU
 	depends on !BR2_PREFER_STATIC_LIB
+	depends on !BR2_powerpc_SPE
 	select BR2_TOOLCHAIN_USES_GLIBC
 	# our glibc.mk enables RPC support
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
Signature · 1 line
1.8.5.5
author
#3 lore raw

PATCH 3/3 glibc: add eglibc 2.19-svnr25243 and choice menu

In reply to Gustavo Zacarias

Add glibc 2.19-svnr25243 and a choice menu to select between different eglibc versions.
Blacklist it for PowerPC SPE since it's broken.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/glibc/Config.in | 17 +++++++++++++++++
 package/glibc/glibc.mk  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
package/glibc/Config.in +17 -0
index 1c1d5e5..83f655a 100644
@@ -1,3 +1,20 @@
+if BR2_TOOLCHAIN_BUILDROOT_EGLIBC
+
+choice
+	prompt "eglibc version"
+	default BR2_EGLIBC_VERSION_2_18
+
+config BR2_EGLIBC_VERSION_2_18
+	bool "2.18-svnr23787"
+
+config BR2_EGLIBC_VERSION_2_19
+	bool "2.19-svnr25243"
+	depends on !BR2_powerpc_SPE
+
+endchoice
+
+endif
+
 if BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 choice
package/glibc/glibc.mk +1 -1
index d02ab7e..f841fd0 100644
@@ -5,7 +5,7 @@
 ################################################################################
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y)
-GLIBC_VERSION = 2.18-svnr23787
+GLIBC_VERSION = $(if $(BR2_EGLIBC_VERSION_2_19),2.19-svnr25243,2.18-svnr23787)
 GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
 GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2
 GLIBC_SRC_SUBDIR = libc
Signature · 1 line
1.8.5.5