diff options
| -rw-r--r-- | package/glibc/Config.in | 21 | ||||
| -rw-r--r-- | package/glibc/glibc.mk | 2 | ||||
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in | 2 |
3 files changed, 23 insertions, 2 deletions
diff --git a/package/glibc/Config.in b/package/glibc/Config.in new file mode 100644 index 0000000000..a92b5eae4b --- /dev/null +++ b/package/glibc/Config.in @@ -0,0 +1,21 @@ +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 + +config BR2_GLIBC_VERSION_2_18 + bool "2.18" + +config BR2_GLIBC_VERSION_2_19 + bool "2.19" + +endchoice + +endif diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 96de02a754..89eaaf6de5 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -21,7 +21,7 @@ GLIBC_SITE = http://downloads.yoctoproject.org/releases/eglibc/ GLIBC_SOURCE = eglibc-$(GLIBC_VERSION).tar.bz2 GLIBC_SRC_SUBDIR = libc else -GLIBC_VERSION = 2.18 +GLIBC_VERSION = $(if $(BR2_GLIBC_VERSION_2_19),2.19,2.18) GLIBC_SITE = $(BR2_GNU_MIRROR)/libc GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz GLIBC_SRC_SUBDIR = . diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index cd88889c4a..eb5ee4644a 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -70,7 +70,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LIBC default "glibc" if BR2_TOOLCHAIN_BUILDROOT_GLIBC source "package/uclibc/Config.in" - +source "package/glibc/Config.in" source "package/binutils/Config.in.host" source "package/gcc/Config.in.host" source "package/elf2flt/Config.in.host" |
