1.1 --- a/scripts/build/libc/eglibc.sh	Fri May 27 22:02:30 2011 -0300
     1.2 +++ b/scripts/build/libc/eglibc.sh	Tue May 31 20:55:30 2011 +0200
     1.3 @@ -1,10 +1,12 @@
     1.4  # eglibc build functions (initially by Thomas JOURDAN).
     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  #   do_libc_add_ons_list
    1.12 +#   do_libc_min_kernel_config
    1.13  . "${CT_LIB_DIR}/scripts/build/libc/glibc-eglibc.sh-common"
    1.14  
    1.15  # Download eglibc repository
    1.16 @@ -98,48 +100,6 @@
    1.17      return 0
    1.18  }
    1.19  
    1.20 -# Extract eglibc
    1.21 -do_libc_extract() {
    1.22 -    CT_Extract "eglibc-${CT_LIBC_VERSION}"
    1.23 -    CT_Patch "eglibc" "${CT_LIBC_VERSION}"
    1.24 -
    1.25 -    # C library addons
    1.26 -    for addon in $(do_libc_add_ons_list " "); do
    1.27 -        # NPTL addon is not to be extracted, in any case
    1.28 -        [ "${addon}" = "nptl" ] && continue || true
    1.29 -        CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
    1.30 -        CT_Extract nochdir "eglibc-${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 "eglibc-${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 "eglibc-${addon}-${CT_LIBC_VERSION}" ]; then
    1.40 -            mv "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
    1.41 -        fi
    1.42 -
    1.43 -        ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
    1.44 -
    1.45 -        CT_Patch nochdir "eglibc" "${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 "eglibc-${addon}-${CT_LIBC_VERSION}"
    1.50 -
    1.51 -        CT_Popd
    1.52 -    done
    1.53 -
    1.54 -    # The configure files may be older than the configure.in files
    1.55 -    # if using a snapshot (or even some tarballs). Fake them being
    1.56 -    # up to date.
    1.57 -    find "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
    1.58 -
    1.59 -    return 0
    1.60 -}
    1.61 -
    1.62  # Copy user provided eglibc configuration file if provided
    1.63  do_libc_check_config() {
    1.64      if [ "${CT_EGLIBC_CUSTOM_CONFIG}" != "y" ]; then