From 5273394f55d5ef3e2cbd9b4546f531c3b7a1ca5a Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Thu, 9 Feb 2017 13:41:09 -0800 Subject: Ports patches for glibc 2.12.1 .. 2.16 Add patches for versions that didn't have them - patches updated/retired as necessary. Also, disallow 2.12.2 for architectures in ports - this version did not have ports addon. Signed-off-by: Alexey Neyman --- config/libc/glibc.in | 2 ++ config/libc/glibc.in.2 | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'config/libc') diff --git a/config/libc/glibc.in b/config/libc/glibc.in index 79102305..64272a04 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -154,10 +154,12 @@ config LIBC_GLIBC_V_2_13 prompt "2.13 (OBSOLETE)" depends on OBSOLETE +# This version did not have glibc-ports addon released config LIBC_GLIBC_V_2_12_2 bool prompt "2.12.2 (OBSOLETE)" depends on OBSOLETE + depends on !LIBC_GLIBC_NEEDS_PORTS config LIBC_GLIBC_V_2_12_1 bool diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2 index d3030a3d..8c8bb82d 100644 --- a/config/libc/glibc.in.2 +++ b/config/libc/glibc.in.2 @@ -7,15 +7,17 @@ # Ports were integrated into the main tarball in 2.17 config LIBC_GLIBC_PORTS_EXTERNAL - bool - default y + def_bool y depends on !LIBC_GLIBC_2_17_or_later +config LIBC_GLIBC_NEEDS_PORTS + def_bool y + depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc + # Ports are no longer an add-on starting with 2.20 config LIBC_GLIBC_USE_PORTS - bool - default y if ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc - depends on !LIBC_GLIBC_2_20_or_later + def_bool y + depends on LIBC_GLIBC_NEEDS_PORTS && !LIBC_GLIBC_2_20_or_later # Force using the BFD linker during the toolchain build config LIBC_glibc_family -- cgit v1.2.3