1.1 --- a/scripts/build/libc/glibc.sh Fri May 27 22:02:30 2011 -0300
1.2 +++ b/scripts/build/libc/glibc.sh Sun May 29 19:24:41 2011 +0200
1.3 @@ -3,6 +3,7 @@
1.4 # Licensed under the GPL v2. See COPYING in the root of this package
1.5
1.6 # Add the definitions common to glibc and eglibc
1.7 +# do_libc_extract
1.8 # do_libc_start_files
1.9 # do_libc
1.10 # do_libc_finish
1.11 @@ -37,54 +38,6 @@
1.12 return 0
1.13 }
1.14
1.15 -# Extract glibc
1.16 -do_libc_extract() {
1.17 - local -a addons_list
1.18 -
1.19 - addons_list=($(do_libc_add_ons_list " "))
1.20 -
1.21 - CT_Extract "glibc-${CT_LIBC_VERSION}"
1.22 -
1.23 - CT_Pushd "${CT_SRC_DIR}/glibc-${CT_LIBC_VERSION}"
1.24 - CT_Patch nochdir "glibc" "${CT_LIBC_VERSION}"
1.25 -
1.26 - # C library addons
1.27 - for addon in "${addons_list[@]}"; do
1.28 - # NPTL addon is not to be extracted, in any case
1.29 - [ "${addon}" = "nptl" ] && continue || true
1.30 - CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
1.31 -
1.32 - CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \
1.33 - -d "${addon}" -a -d "glibc-${addon}-${CT_LIBC_VERSION}"
1.34 -
1.35 - # Some addons have the 'long' name, while others have the
1.36 - # 'short' name, but patches are non-uniformly built with
1.37 - # either the 'long' or 'short' name, whatever the addons name
1.38 - # but we prefer the 'short' name and avoid duplicates.
1.39 - if [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ]; then
1.40 - mv "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
1.41 - fi
1.42 -
1.43 - ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
1.44 -
1.45 - CT_Patch nochdir "glibc" "${addon}-${CT_LIBC_VERSION}"
1.46 -
1.47 - # Remove the long name since it can confuse configure scripts to run
1.48 - # the same source twice.
1.49 - rm "glibc-${addon}-${CT_LIBC_VERSION}"
1.50 - done
1.51 -
1.52 - # The configure files may be older than the configure.in files
1.53 - # if using a snapshot (or even some tarballs). Fake them being
1.54 - # up to date.
1.55 - sleep 2
1.56 - find . -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
1.57 -
1.58 - CT_Popd
1.59 -
1.60 - return 0
1.61 -}
1.62 -
1.63 # There is nothing to do for glibc check config
1.64 do_libc_check_config() {
1.65 :