diff mbox

[OpenWrt-Devel,1/2] toolchain: The glorious return of glibc, ver 2.21

Message ID CAJq09z4sLhFs6N-PH=SXhpSJLZtPm=Y5vpq6UrmaC-1NwYmd=g@mail.gmail.com
State Accepted
Headers show

Commit Message

Luiz Angelo Daros de Luca March 15, 2015, 12:32 a.m. UTC
Hi Jeff and John,

This patch removed the "default" line about the "C Library implementation".
Is it
intentional? I guess this was the part that John modified.
https://github.com/openwrt-mirror/openwrt/commit/60e0b4c321836f6523c25a1de1a6a79085a1bdc6#diff-8912cc62562db921fbbf1e444d6b4e3dL215

As a probably side effect, buildbot for x86 is using glibc now:
https://downloads.openwrt.org/snapshots/trunk/x86/generic/OpenWrt-Toolchain-x86-generic_gcc-4.8-linaro_glibc-2.19.Linux-x86_64.tar.bz2

While in my local buildroot, I get uclibc, even defining target before
defconfig.

$ rm .config
$ cat >.config
CONFIG_TARGET_x86=y
CONFIG_TARGET_x86_generic=y
$ make defconfig
$ egrep USE_.*LIBC .config
CONFIG_USE_UCLIBCXX=y
CONFIG_USE_UCLIBC=y

I though that buildbot config where only "set target+defconfig+select all
packages".

This is the relevant patch part:



Em qui, 12 de mar de 2015 às 20:01, Jeff Waugh <jdub@bethesignal.org>
escreveu:

> On Fri, Mar 13, 2015 at 6:25 AM, John Crispin <blogic@openwrt.org> wrote:
> >> Please don't just compile test. Right now /usr/lib is not added as a
> >> searchable path for so-libs which renders it pretty much unusable.
> >> That was what the now missing patch 200-add-dl-search-paths.patch dealt
> >> with.
> >
> > already fixed :) i will push jeffs patch with a few minor fixes in the
> > next hour or so
>
> Aha, had been trying to figure that one out. :-)
>
> Thanks,
> Jeff
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel@lists.openwrt.org
> https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
>

Comments

John Crispin March 15, 2015, 6:36 a.m. UTC | #1
thanks for spotting this, r44766 should fix it


On 15/03/2015 01:32, Luiz Angelo Daros de Luca wrote:
> Hi Jeff and John,
> 
> This patch removed the "default" line about the "C Library
> implementation". Is it
> intentional? I guess this was the part that John modified.
> https://github.com/openwrt-mirror/openwrt/commit/60e0b4c321836f6523c25a1de1a6a79085a1bdc6#diff-8912cc62562db921fbbf1e444d6b4e3dL215
> 
> As a probably side effect, buildbot for x86 is using glibc now:
> https://downloads.openwrt.org/snapshots/trunk/x86/generic/OpenWrt-Toolchain-x86-generic_gcc-4.8-linaro_glibc-2.19.Linux-x86_64.tar.bz2
> 
> While in my local buildroot, I get uclibc, even defining target before
> defconfig.
> 
> $ rm .config
> $ cat >.config
> CONFIG_TARGET_x86=y
> CONFIG_TARGET_x86_generic=y
> $ make defconfig
> $ egrep USE_.*LIBC .config
> CONFIG_USE_UCLIBCXX=y
> CONFIG_USE_UCLIBC=y
> 
> I though that buildbot config where only "set target+defconfig+select
> all packages".
> 
> This is the relevant patch part:
> 
> diff --git a/toolchain/Config.in b/toolchain/Config.in
> index ecd9d20..0d03a28 100644
> --- a/toolchain/Config.in
> +++ b/toolchain/Config.in
> @@ -211,14 +211,13 @@ comment "C Library"
>  
>  choice
>         prompt "C Library implementation" if TOOLCHAINOPTS
> -       default LIBC_USE_EGLIBC if (aarch64 || aarch64_be)
> -       default LIBC_USE_UCLIBC
> +       default LIBC_USE_GLIBC if (aarch64 || aarch64_be)
>         help
>           Select the C library implementation.
>  
> -       config LIBC_USE_EGLIBC
> -               bool "Use eglibc"
> -               select USE_EGLIBC
> +       config LIBC_USE_GLIBC
> +               bool "Use glibc"
> +               select USE_GLIBC
>                 depends on !avr32
>  
>         config LIBC_USE_UCLIBC
> 
> 
> Em qui, 12 de mar de 2015 às 20:01, Jeff Waugh <jdub@bethesignal.org
> <mailto:jdub@bethesignal.org>> escreveu:
> 
>     On Fri, Mar 13, 2015 at 6:25 AM, John Crispin <blogic@openwrt.org
>     <mailto:blogic@openwrt.org>> wrote:
>     >> Please don't just compile test. Right now /usr/lib is not added as a
>     >> searchable path for so-libs which renders it pretty much unusable.
>     >> That was what the now missing patch 200-add-dl-search-paths.patch
>     dealt
>     >> with.
>     >
>     > already fixed :) i will push jeffs patch with a few minor fixes in the
>     > next hour or so
> 
>     Aha, had been trying to figure that one out. :-)
> 
>     Thanks,
>     Jeff
>     _________________________________________________
>     openwrt-devel mailing list
>     openwrt-devel@lists.openwrt.__org
>     <mailto:openwrt-devel@lists.openwrt.org>
>     https://lists.openwrt.org/cgi-__bin/mailman/listinfo/openwrt-__devel
>     <https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel>
>
diff mbox

Patch

diff --git a/toolchain/Config.in b/toolchain/Config.in
index ecd9d20..0d03a28 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -211,14 +211,13 @@  comment "C Library"

 choice
        prompt "C Library implementation" if TOOLCHAINOPTS
-       default LIBC_USE_EGLIBC if (aarch64 || aarch64_be)
-       default LIBC_USE_UCLIBC
+       default LIBC_USE_GLIBC if (aarch64 || aarch64_be)
        help
          Select the C library implementation.

-       config LIBC_USE_EGLIBC
-               bool "Use eglibc"
-               select USE_EGLIBC
+       config LIBC_USE_GLIBC
+               bool "Use glibc"
+               select USE_GLIBC
                depends on !avr32

        config LIBC_USE_UCLIBC