libc/{glibc,eglibc}: Don't download glibc-ports when not available
authorDaniel Zimmermann <netzimme@gmail.com>
Sat Nov 16 16:16:51 2013 +0100 (2013-11-16)
changeset 3251ec603d1371b9
parent 3250 48f5cb844d26
child 3252 7e569a9cb5fd
libc/{glibc,eglibc}: Don't download glibc-ports when not available

Don't download glibc-ports when glibc or eglibc version greater than 2.16,
because the "ports" source is mainline in the glibc or eglibc since version 2.17.

Signed-off-by: "Daniel Zimmermann" <netzimme@gmail.com>
Message-Id: <9c045ca3cf1b9dc89da3.1384602843@haus-VirtualBox>
Patchwork-Id: 291766
[yann.morin.1998@free.fr: slightly tweak subject, change variable name]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
config/libc/eglibc.in
config/libc/glibc-eglibc.in-common
config/libc/glibc.in
scripts/build/libc/eglibc.sh
scripts/build/libc/glibc.sh
     1.1 --- a/config/libc/eglibc.in	Sat Nov 16 11:33:31 2013 +0100
     1.2 +++ b/config/libc/eglibc.in	Sat Nov 16 16:16:51 2013 +0100
     1.3 @@ -32,35 +32,43 @@
     1.4  config LIBC_EGLIBC_V_2_16
     1.5      bool
     1.6      prompt "2_16"
     1.7 +    select LIBC_GLIBC_PORTS_EXTERNAL
     1.8      select LIBC_EGLIBC_2_16_or_later
     1.9  
    1.10  config LIBC_EGLIBC_V_2_15
    1.11      bool
    1.12      prompt "2_15"
    1.13 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.14  
    1.15  config LIBC_EGLIBC_V_2_14
    1.16      bool
    1.17      prompt "2_14"
    1.18 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.19  
    1.20  config LIBC_EGLIBC_V_2_13
    1.21      bool
    1.22      prompt "2_13"
    1.23 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.24  
    1.25  config LIBC_EGLIBC_V_2_12
    1.26      bool
    1.27      prompt "2_12"
    1.28 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.29  
    1.30  config LIBC_EGLIBC_V_2_11
    1.31      bool
    1.32      prompt "2_11"
    1.33 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.34  
    1.35  config LIBC_EGLIBC_V_2_10
    1.36      bool
    1.37      prompt "2_10"
    1.38 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.39  
    1.40  config LIBC_EGLIBC_V_2_9
    1.41      bool
    1.42      prompt "2_9"
    1.43 +    select LIBC_GLIBC_PORTS_EXTERNAL
    1.44  
    1.45  config LIBC_EGLIBC_V_TRUNK
    1.46      bool
     2.1 --- a/config/libc/glibc-eglibc.in-common	Sat Nov 16 11:33:31 2013 +0100
     2.2 +++ b/config/libc/glibc-eglibc.in-common	Sat Nov 16 16:16:51 2013 +0100
     2.3 @@ -4,6 +4,11 @@
     2.4  # Some architectures require the ports addon. List them one by one here:
     2.5  # This list must be carefully in sync with the architectures names
     2.6  # we can find in config/arch/*
     2.7 +
     2.8 +config LIBC_GLIBC_PORTS_EXTERNAL
     2.9 +    bool
    2.10 +    default n
    2.11 +
    2.12  config LIBC_GLIBC_MAY_FORCE_PORTS
    2.13      bool
    2.14      default y if ARCH_arm
     3.1 --- a/config/libc/glibc.in	Sat Nov 16 11:33:31 2013 +0100
     3.2 +++ b/config/libc/glibc.in	Sat Nov 16 16:16:51 2013 +0100
     3.3 @@ -25,51 +25,63 @@
     3.4  config LIBC_GLIBC_V_2_16_0
     3.5      bool
     3.6      prompt "2.16.0"
     3.7 +    select LIBC_GLIBC_PORTS_EXTERNAL
     3.8  
     3.9  config LIBC_GLIBC_V_2_15
    3.10      bool
    3.11      prompt "2.15"
    3.12 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.13  
    3.14  config LIBC_GLIBC_V_2_14_1
    3.15      bool
    3.16      prompt "2.14.1"
    3.17 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.18  
    3.19  config LIBC_GLIBC_V_2_14
    3.20      bool
    3.21      prompt "2.14"
    3.22 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.23  
    3.24  config LIBC_GLIBC_V_2_13
    3.25      bool
    3.26      prompt "2.13"
    3.27 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.28  
    3.29  config LIBC_GLIBC_V_2_12_2
    3.30      bool
    3.31      prompt "2.12.2"
    3.32 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.33  
    3.34  config LIBC_GLIBC_V_2_12_1
    3.35      bool
    3.36      prompt "2.12.1"
    3.37 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.38  
    3.39  config LIBC_GLIBC_V_2_11_1
    3.40      bool
    3.41      prompt "2.11.1"
    3.42 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.43  
    3.44  config LIBC_GLIBC_V_2_11
    3.45      bool
    3.46      prompt "2.11"
    3.47 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.48  
    3.49  config LIBC_GLIBC_V_2_10_1
    3.50      bool
    3.51      prompt "2.10.1"
    3.52 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.53      select LIBC_GLIBC_USE_PORTS
    3.54  
    3.55  config LIBC_GLIBC_V_2_9
    3.56      bool
    3.57      prompt "2.9"
    3.58 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.59  
    3.60  config LIBC_GLIBC_V_2_8
    3.61      bool
    3.62      prompt "2.8"
    3.63 +    select LIBC_GLIBC_PORTS_EXTERNAL
    3.64  
    3.65  endchoice
    3.66  
     4.1 --- a/scripts/build/libc/eglibc.sh	Sat Nov 16 11:33:31 2013 +0100
     4.2 +++ b/scripts/build/libc/eglibc.sh	Sat Nov 16 16:16:51 2013 +0100
     4.3 @@ -42,6 +42,11 @@
     4.4              nptl)   continue;;
     4.5          esac
     4.6  
     4.7 +        case "${CT_LIBC_GLIBC_PORTS_EXTERNAL}" in
     4.8 +            y)   ;;
     4.9 +            *)   continue;;
    4.10 +        esac
    4.11 +
    4.12          if ! CT_GetSVN "eglibc-${addon}-${CT_LIBC_VERSION}" \
    4.13                         "${svn_base}/${addon}"               \
    4.14                         "${CT_EGLIBC_REVISION:-HEAD}"
     5.1 --- a/scripts/build/libc/glibc.sh	Sat Nov 16 11:33:31 2013 +0100
     5.2 +++ b/scripts/build/libc/glibc.sh	Sat Nov 16 16:16:51 2013 +0100
     5.3 @@ -32,6 +32,11 @@
     5.4              nptl)   continue;;
     5.5          esac
     5.6  
     5.7 +        case "${CT_LIBC_GLIBC_PORTS_EXTERNAL}" in
     5.8 +            y)   ;;
     5.9 +            *)   continue;;
    5.10 +        esac
    5.11 +
    5.12          if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}"     \
    5.13                          {ftp,http}://ftp.gnu.org/gnu/glibc      \
    5.14                          ftp://gcc.gnu.org/pub/glibc/releases    \