Fix C library addons/locales downloading.
Prepare for using the ports addon easily.
1.1 --- a/config/libc_glibc.in Wed Mar 07 19:02:17 2007 +0000
1.2 +++ b/config/libc_glibc.in Sat Mar 10 14:46:35 2007 +0000
1.3 @@ -179,6 +179,19 @@
1.4 Note: this is awkward, doesn't work well if you need more than one
1.5 line in configparms
1.6
1.7 +config LIBC_GLIBC_USE_PORTS
1.8 + bool
1.9 + prompt "Use the ports addon"
1.10 + default y
1.11 + help
1.12 + The ports addon contains some architecture ports that are not available
1.13 + in the official glibc distribution.
1.14 +
1.15 + For example, this is the case for ARM with glibc >= 2.4
1.16 +
1.17 + Say n only if you're sure that your architecture is in the official
1.18 + glibc distribution for your chosen version.
1.19 +
1.20 config LIBC_ADDONS
1.21 bool
1.22 prompt "Pass extra addons list"
1.23 @@ -191,6 +204,7 @@
1.24 string
1.25 prompt "Extra addons"
1.26 default ""
1.27 + depends on LIBC_ADDONS
1.28 help
1.29 Extra addons to include in glibc.
1.30
2.1 --- a/scripts/getExtractPatch.sh Wed Mar 07 19:02:17 2007 +0000
2.2 +++ b/scripts/getExtractPatch.sh Sat Mar 10 14:46:35 2007 +0000
2.3 @@ -282,15 +282,10 @@
2.4 # C library addons
2.5 addons_list=`echo "${CT_LIBC_ADDONS}" |sed -r -e 's/,/ /g; s/ $//g;'`
2.6 for addon in ${addons_list}; do
2.7 - CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \
2.8 - ftp://ftp.gnu.org/gnu/glibc
2.9 + CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" ${libc_src}
2.10 done
2.11 - if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
2.12 - CT_GetFile "uClibc-locale-030818" \
2.13 - http://www.uclibc.org/downloads \
2.14 - http://www.uclibc.org/downloads/snapshots \
2.15 - http://www.uclibc.org/downloads/old-releases
2.16 - fi
2.17 + [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_GetFile "${CT_LIBC}-ports-${CT_LIBC_VERSION}" ${libc_src}
2.18 + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src}
2.19
2.20 # libfloat if asked for
2.21 if [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ]; then
2.22 @@ -326,9 +321,8 @@
2.23 for addon in ${addons_list}; do
2.24 CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
2.25 done
2.26 - if [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ]; then
2.27 - CT_ExtractAndPatch "uclibc-locale-030818"
2.28 - fi
2.29 + [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && CT_ExtractAndPatch "${CT_LIBC}-ports-${CT_LIBC_VERSION}"
2.30 + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818"
2.31
2.32 [ "${CT_ARCH_FLOAT_SW_LIBFLOAT}" = "y" ] && CT_ExtractAndPatch "${CT_LIBFLOAT_FILE}"
2.33