# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1173537995 0
# Node ID ba927c7db67903bcebb1830c8e013884aff8013b
# Parent  99f12637cdf063ebf45a57c79d486fbb9368c366
Fix C library addons/locales downloading.
Prepare for using the ports addon easily.

diff -r 99f12637cdf0 -r ba927c7db679 config/libc_glibc.in
--- a/config/libc_glibc.in	Wed Mar 07 19:02:17 2007 +0000
+++ b/config/libc_glibc.in	Sat Mar 10 14:46:35 2007 +0000
@@ -179,6 +179,19 @@
       Note: this is awkward, doesn't work well if you need more than one
             line in configparms
 
+config LIBC_GLIBC_USE_PORTS
+    bool
+    prompt "Use the ports addon"
+    default y
+    help
+      The ports addon contains some architecture ports that are not available
+      in the official glibc distribution.
+      
+      For example, this is the case for ARM with glibc >= 2.4
+      
+      Say n only if you're sure that your architecture is in the official
+      glibc distribution for your chosen version.
+
 config LIBC_ADDONS
     bool
     prompt "Pass extra addons list"
@@ -191,6 +204,7 @@
     string
     prompt "Extra addons"
     default ""
+    depends on LIBC_ADDONS
     help
       Extra addons to include in glibc.
       
diff -r 99f12637cdf0 -r ba927c7db679 scripts/getExtractPatch.sh
--- a/scripts/getExtractPatch.sh	Wed Mar 07 19:02:17 2007 +0000
+++ b/scripts/getExtractPatch.sh	Sat Mar 10 14:46:35 2007 +0000
@@ -282,15 +282,10 @@
     # C library addons
     addons_list=`echo "${CT_LIBC_ADDONS}" |sed -r -e 's/,/ /g; s/ $//g;'`
     for addon in ${addons_list}; do
-        CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \
-                   ftp://ftp.gnu.org/gnu/glibc
+        CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ${libc_src}
     done
-    if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
-        CT_GetFile "uClibc-locale-030818"                        \
-                   http://www.uclibc.org/downloads               \
-                   http://www.uclibc.org/downloads/snapshots     \
-                   http://www.uclibc.org/downloads/old-releases
-    fi
+    [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_GetFile "${CT_LIBC}-ports-${CT_LIBC_VERSION}" ${libc_src}
+    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src}
 
     # libfloat if asked for
     if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
@@ -326,9 +321,8 @@
     for addon in ${addons_list}; do
         CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
     done
-    if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
-        CT_ExtractAndPatch "uclibc-locale-030818"
-    fi
+    [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_ExtractAndPatch "${CT_LIBC}-ports-${CT_LIBC_VERSION}"
+    [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818"
 
     [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ] && CT_ExtractAndPatch "${CT_LIBFLOAT_FILE}"