[Buildroot] [PATCHv2 1/2] glibc: drop redundant arch depends

[Buildroot] [PATCHv2 1/2] glibc: drop redundant arch depends

[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 <gustavo@zacarias.com.ar>
---
 package/glibc/Config.in | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index d1ad3de..dbb1a19 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -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"
-- 
1.8.5.5

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[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 <gustavo@zacarias.com.ar>
---
 package/glibc/Config.in | 17 +++++++++++++++++
 package/glibc/glibc.mk  |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/package/glibc/Config.in b/package/glibc/Config.in
index dbb1a19..494c0f9 100644
--- a/package/glibc/Config.in
+++ b/package/glibc/Config.in
@@ -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
diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
index d02ab7e..f841fd0 100644
--- a/package/glibc/glibc.mk
+++ b/package/glibc/glibc.mk
@@ -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
-- 
1.8.5.5

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[Baruch Siach]

Hi Gustavo,

On Sun, Jun 01, 2014 at 08:58:39AM -0300, Gustavo Zacarias wrote:
> 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 <gustavo@zacarias.com.ar>
> ---
>  package/glibc/Config.in | 17 +++++++++++++++++
>  package/glibc/glibc.mk  |  2 +-
>  2 files changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/package/glibc/Config.in b/package/glibc/Config.in
> index dbb1a19..494c0f9 100644
> --- a/package/glibc/Config.in
> +++ b/package/glibc/Config.in
> @@ -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
> diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk
> index d02ab7e..f841fd0 100644
> --- a/package/glibc/glibc.mk
> +++ b/package/glibc/glibc.mk
> @@ -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

>  GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/
>  GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2
>  GLIBC_SRC_SUBDIR = libc

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

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[Gustavo Zacarias]

On 06/01/2014 09:24 AM, Baruch Siach wrote:

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

[Buildroot] [PATCHv2 1/2] glibc: drop redundant arch depends

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Sun,  1 Jun 2014 08:58:38 -0300, Gustavo Zacarias wrote:
> 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 <gustavo@zacarias.com.ar>
> ---
>  package/glibc/Config.in | 7 -------
>  1 file changed, 7 deletions(-)

Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Sun,  1 Jun 2014 08:58:39 -0300, Gustavo Zacarias wrote:

> +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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[Gustavo Zacarias]

On 06/01/2014 09:34 AM, Thomas Petazzoni wrote:

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

[Buildroot] [PATCHv2 2/2] glibc: add eglibc 2.19-svnr25243 and choice menu

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Sun, 01 Jun 2014 09:46:50 -0300, Gustavo Zacarias wrote:

> > 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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCHv2 1/2] glibc: drop redundant arch depends

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> 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 <gustavo@zacarias.com.ar>

Committed, thanks.

-- 
Bye, Peter Korsgaard