From f63e4f060426ab97755b251f31727c7eb21fb53d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@free.fr>
Date: Sat, 16 Nov 2013 16:16:51 +0100
Subject: 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 --git a/config/libc/eglibc.in b/config/libc/eglibc.in
index 3635601..085c7ee 100644
--- a/config/libc/eglibc.in
+++ b/config/libc/eglibc.in
@@ -32,35 +32,43 @@ config LIBC_EGLIBC_V_2_17
 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 --git a/config/libc/glibc-eglibc.in-common b/config/libc/glibc-eglibc.in-common
index f27101c..6c5d2f0 100644
--- a/config/libc/glibc-eglibc.in-common
+++ b/config/libc/glibc-eglibc.in-common
@@ -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 --git a/config/libc/glibc.in b/config/libc/glibc.in
index bb9becc..f2dc365 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -25,51 +25,63 @@ config LIBC_GLIBC_V_2_17
 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 --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh
index 37f837a..6ba7e43 100644
--- a/scripts/build/libc/eglibc.sh
+++ b/scripts/build/libc/eglibc.sh
@@ -42,6 +42,11 @@ do_libc_get() {
             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 --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 6323c7c..896432f 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -32,6 +32,11 @@ do_libc_get() {
             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    \
-- 
cgit v0.10.2-6-g49f6