From 93b0db91b486d9a290487f9c60ef10f9c5a5d731 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 30 May 2011 23:05:28 +0200 Subject: 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" --- scripts/build/libc/glibc-eglibc.sh-common | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts/build/libc/glibc-eglibc.sh-common') diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common index a321b7ab..ae7c3793 100644 --- a/scripts/build/libc/glibc-eglibc.sh-common +++ b/scripts/build/libc/glibc-eglibc.sh-common @@ -11,8 +11,13 @@ do_libc_extract() { # Extract the add-opns for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be extracted, in any case - [ "${addon}" = "nptl" ] && continue || true + # If the addon was bundled with the main archive, we do not + # need to extract it. Worse, if we were to try to extract + # it, we'd get an error. + if [ -d "${addon}" ]; then + CT_DoLog DEBUG "Add-on already present, spkipping extraction" + continue + fi CT_Extract nochdir "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" -- cgit v1.2.3