# HG changeset patch
# User Daniel Zimmermann <netzimme@gmail.com>
# Date 1384615011 -3600
# Node ID ec603d1371b9b25805b79a8dfd0e4657229484a3
# Parent  48f5cb844d264daa248645a8eaee0ba7537bf5bb
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>

diff -r 48f5cb844d26 -r ec603d1371b9 config/libc/eglibc.in
--- a/config/libc/eglibc.in	Sat Nov 16 11:33:31 2013 +0100
+++ b/config/libc/eglibc.in	Sat Nov 16 16:16:51 2013 +0100
@@ -32,35 +32,43 @@
 config LIBC_EGLIBC_V_2_16
     bool
     prompt "2_16"
+    select LIBC_GLIBC_PORTS_EXTERNAL
     select LIBC_EGLIBC_2_16_or_later
 
 config LIBC_EGLIBC_V_2_15
     bool
     prompt "2_15"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_14
     bool
     prompt "2_14"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_13
     bool
     prompt "2_13"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_12
     bool
     prompt "2_12"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_11
     bool
     prompt "2_11"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_10
     bool
     prompt "2_10"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_2_9
     bool
     prompt "2_9"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_EGLIBC_V_TRUNK
     bool
diff -r 48f5cb844d26 -r ec603d1371b9 config/libc/glibc-eglibc.in-common
--- a/config/libc/glibc-eglibc.in-common	Sat Nov 16 11:33:31 2013 +0100
+++ b/config/libc/glibc-eglibc.in-common	Sat Nov 16 16:16:51 2013 +0100
@@ -4,6 +4,11 @@
 # Some architectures require the ports addon. List them one by one here:
 # This list must be carefully in sync with the architectures names
 # we can find in config/arch/*
+
+config LIBC_GLIBC_PORTS_EXTERNAL
+    bool
+    default n
+
 config LIBC_GLIBC_MAY_FORCE_PORTS
     bool
     default y if ARCH_arm
diff -r 48f5cb844d26 -r ec603d1371b9 config/libc/glibc.in
--- a/config/libc/glibc.in	Sat Nov 16 11:33:31 2013 +0100
+++ b/config/libc/glibc.in	Sat Nov 16 16:16:51 2013 +0100
@@ -25,51 +25,63 @@
 config LIBC_GLIBC_V_2_16_0
     bool
     prompt "2.16.0"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_15
     bool
     prompt "2.15"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_14_1
     bool
     prompt "2.14.1"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_14
     bool
     prompt "2.14"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_13
     bool
     prompt "2.13"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_12_2
     bool
     prompt "2.12.2"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_12_1
     bool
     prompt "2.12.1"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_11_1
     bool
     prompt "2.11.1"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_11
     bool
     prompt "2.11"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_10_1
     bool
     prompt "2.10.1"
+    select LIBC_GLIBC_PORTS_EXTERNAL
     select LIBC_GLIBC_USE_PORTS
 
 config LIBC_GLIBC_V_2_9
     bool
     prompt "2.9"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 config LIBC_GLIBC_V_2_8
     bool
     prompt "2.8"
+    select LIBC_GLIBC_PORTS_EXTERNAL
 
 endchoice
 
diff -r 48f5cb844d26 -r ec603d1371b9 scripts/build/libc/eglibc.sh
--- a/scripts/build/libc/eglibc.sh	Sat Nov 16 11:33:31 2013 +0100
+++ b/scripts/build/libc/eglibc.sh	Sat Nov 16 16:16:51 2013 +0100
@@ -42,6 +42,11 @@
             nptl)   continue;;
         esac
 
+        case "${CT_LIBC_GLIBC_PORTS_EXTERNAL}" in
+            y)   ;;
+            *)   continue;;
+        esac
+
         if ! CT_GetSVN "eglibc-${addon}-${CT_LIBC_VERSION}" \
                        "${svn_base}/${addon}"               \
                        "${CT_EGLIBC_REVISION:-HEAD}"
diff -r 48f5cb844d26 -r ec603d1371b9 scripts/build/libc/glibc.sh
--- a/scripts/build/libc/glibc.sh	Sat Nov 16 11:33:31 2013 +0100
+++ b/scripts/build/libc/glibc.sh	Sat Nov 16 16:16:51 2013 +0100
@@ -32,6 +32,11 @@
             nptl)   continue;;
         esac
 
+        case "${CT_LIBC_GLIBC_PORTS_EXTERNAL}" in
+            y)   ;;
+            *)   continue;;
+        esac
+
         if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}"     \
                         {ftp,http}://ftp.gnu.org/gnu/glibc      \
                         ftp://gcc.gnu.org/pub/glibc/releases    \