ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2025-01-18 02:39:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

glibc: properly handle internal addons

Browse Source 
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>
This commit is contained in:
Yann E. MORIN" 2011-05-30 23:05:28 +02:00
parent 3d6ce4cd3d
commit 93b0db91b4
3 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build/libc/eglibc.sh
View File

@ -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
}

9
scripts/build/libc/glibc-eglibc.sh-common
View File

@ -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}"

19
scripts/build/libc/glibc.sh
View File

@ -27,12 +27,19 @@ do_libc_get() {
# C library addons
for addon in "${addons_list[@]}"; do
# NPTL addon is not to be downloaded, in any case
[ "${addon}" = "nptl" ] && continue || true
CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/glibc \
ftp://gcc.gnu.org/pub/glibc/releases \
ftp://gcc.gnu.org/pub/glibc/snapshots
if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \
{ftp,http}://ftp.gnu.org/gnu/glibc \
ftp://gcc.gnu.org/pub/glibc/releases \
ftp://gcc.gnu.org/pub/glibc/snapshots
then
# Some add-ons are bundled with glibc, others are
# bundled in their own tarball. Eg. NPTL is internal,
# while LinuxThreads was external. Also, for old
# versions of glibc, the libidn add-on was external,
# but with version >=2.10, it is internal.
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
return 0