Skip to contentSkip to conversation

glibc: drop redundant arch depends

PATCH New Gustavo Zacarias 4 participants 9 messages Jun 1, 2014

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH v2 1/2 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 | 7 -------
 1 file changed, 7 deletions(-)
package/glibc/Config.in +0 -7
index d1ad3de..dbb1a19 100644
@@ -3,13 +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_powerpc64   || BR2_powerpc64le || 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 v2 2/2 glibc: add eglibc 2.19-svnr25243 and choice menu

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 dbb1a19..494c0f9 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
#2 lore raw

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

Hi Gustavo,

Quoted 40 lines · 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 dbb1a19..494c0f9 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 +0 -0
index d02ab7e..f841fd0 100644

package/glibc/glibc.mk line 8

Quoted 5 lines
package/glibc/glibc.mk +1 -1
@@ -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)

Is it possible to use BR2_EGLIBC_VERSION_2_1{8,9} here and avoid version string duplication?

baruch

Quoted 3 lines
package/glibc/glibc.mk +0 -0
 GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
 GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2
 GLIBC_SRC_SUBDIR = libc
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#3 lore raw

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

Quoted 2 lines · Baruch Siach

Is it possible to use BR2_EGLIBC_VERSION_2_1{8,9} here and avoid version string duplication?

It's a bool, it'll just give 'y' if it's set...
Regards.

#4 lore raw

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

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

package/glibc/Config.in line 12

Quoted 3 lines · Gustavo Zacarias
package/glibc/Config.in +3 -0
+config BR2_EGLIBC_VERSION_2_19
+	bool "2.19-svnr25243"
+	depends on !BR2_powerpc_SPE

I'd like to see a comment above this dependency that explains why we have this dependency: it's not because there is no support for PowerPC SPE, but only because it's broken, so a future bump to a newer version of eglibc 2.19 might fix the problem.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

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

Quoted 4 lines · Thomas Petazzoni

I'd like to see a comment above this dependency that explains why we have this dependency: it's not because there is no support for PowerPC SPE, but only because it's broken, so a future bump to a newer version of eglibc 2.19 might fix the problem.

Ok.
For the record there are other commits in a similar vein that didn't get that benefit, and it's build breakage (so quite obvious to test & catch). Regards.

#6 lore raw

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

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias
Quoted 4 lines

I'd like to see a comment above this dependency that explains why we have this dependency: it's not because there is no support for PowerPC SPE, but only because it's broken, so a future bump to a newer version of eglibc 2.19 might fix the problem.

Ok.
For the record there are other commits in a similar vein that didn't get that benefit, and it's build breakage (so quite obvious to test & catch).

Yeah, might be the case. I'm not at all pretending that the rest of the code is perfect. Just pointing out that this particular patch could be improved by having a little comment, IMO.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH v2 1/2 glibc: drop redundant arch depends

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 8 lines · Gustavo Zacarias

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 | 7 -------
 1 file changed, 7 deletions(-)
Acked-by Thomas Petazzoni <[email protected]>
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#8 lore raw

PATCH v2 1/2 glibc: drop redundant arch depends

In reply to Gustavo Zacarias
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

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

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard