diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-30 21:05:28 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-05-30 21:05:28 (GMT) |
commit | 93b0db91b486d9a290487f9c60ef10f9c5a5d731 (patch) | |
tree | b3747bf28058222b09616f33ad446eedee85b5d5 /scripts/build/libc/eglibc.sh | |
parent | 3d6ce4cd3d888b390748af42b7ec2826b963df38 (diff) |
glibc: properly handle internal addons
Some addons are bundled with glibc/eglibc, so we should not try to
download and extract them.
This is done as thus:
- at download time:
- if the add-on download fails, keep going;
- at extract time:
- if the addon is present in the source tree, ignore it;
- if the addon is missing in the source tree:
- if the archive is present, extract it;
- if the archive is missing, bail out.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Diffstat (limited to 'scripts/build/libc/eglibc.sh')
-rw-r--r-- | scripts/build/libc/eglibc.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh index a551bc6..101a2a3 100644 --- a/scripts/build/libc/eglibc.sh +++ b/scripts/build/libc/eglibc.sh @@ -26,9 +26,17 @@ do_libc_get() { "${CT_EGLIBC_REVISION:-HEAD}" for addon in $(do_libc_add_ons_list " "); do - CT_GetSVN "eglibc-${addon}-${CT_LIBC_VERSION}" \ - "${svn_base}/${addon}" \ - "${CT_EGLIBC_REVISION:-HEAD}" + # NPTL addon is not to be downloaded, in any case + [ "${addon}" = "nptl" ] && continue || true + if ! CT_GetSVN "eglibc-${addon}-${CT_LIBC_VERSION}" \ + "${svn_base}/${addon}" \ + "${CT_EGLIBC_REVISION:-HEAD}" + then + # Some add-ons are bundled with the main sources + # so failure to download them is expected + CT_DoLog DEBUG "Addon '${addon}' could not be downloaded." + CT_DoLog DEBUG "We'll see later if we can find it in the source tree" + fi done } |