1.1 --- a/scripts/build/libc/eglibc.sh Sat Jan 03 21:11:41 2009 +0000
1.2 +++ b/scripts/build/libc/eglibc.sh Sun Jan 04 22:17:53 2009 +0000
1.3 @@ -18,13 +18,14 @@
1.4 CT_DoExecLog ALL svn ${svn_action} -r "${CT_EGLIBC_REVISION:-HEAD}" "${svn_url}" . 2>&1
1.5
1.6 # Compress eglibc
1.7 - CT_DoExecLog ALL mv libc "${CT_LIBC_FILE}"
1.8 - CT_DoExecLog ALL tar cjf "${CT_LIBC_FILE}.tar.bz2" "${CT_LIBC_FILE}"
1.9 + CT_DoExecLog ALL mv libc "eglibc-${CT_LIBC_VERSION}"
1.10 + CT_DoExecLog ALL tar cjf "eglibc-${CT_LIBC_VERSION}.tar.bz2" "eglibc-${CT_LIBC_VERSION}"
1.11
1.12 # Compress linuxthreads, localedef and ports
1.13 # Assign them the name the way ct-ng like it
1.14 for addon in linuxthreads localedef ports; do
1.15 - CT_DoExecLog ALL tar cjf "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}.tar.bz2" "${addon}"
1.16 + CT_DoExecLog ALL mv "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
1.17 + CT_DoExecLog ALL tar cjf "eglibc-${addon}-${CT_LIBC_VERSION}.tar.bz2" "eglibc-${addon}-${CT_LIBC_VERSION}"
1.18 done
1.19 }
1.20
1.21 @@ -35,7 +36,7 @@
1.22 # simultaneously.
1.23
1.24 # build filename
1.25 - eglibc="${CT_LIBC_FILE}.tar.bz2"
1.26 + eglibc="eglibc-${CT_LIBC_VERSION}.tar.bz2"
1.27 eglibc_linuxthreads="${CT_LIBC}-linuxthreads-${CT_LIBC_VERSION}.tar.bz2"
1.28 eglibc_localedef="${CT_LIBC}-localedef-${CT_LIBC_VERSION}.tar.bz2"
1.29 eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2"
1.30 @@ -91,19 +92,22 @@
1.31
1.32 # Extract eglibc
1.33 do_libc_extract() {
1.34 - CT_ExtractAndPatch "${CT_LIBC_FILE}"
1.35 + CT_ExtractAndPatch "eglibc-${CT_LIBC_VERSION}"
1.36
1.37 # C library addons
1.38 for addon in $(do_libc_add_ons_list " "); do
1.39 # NPTL addon is not to be extracted, in any case
1.40 [ "${addon}" = "nptl" ] && continue || true
1.41 - CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
1.42 + CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
1.43 + CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" nochdir
1.44 + [ ! -d "${addon}" ] && ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
1.45 + CT_Popd
1.46 done
1.47
1.48 # The configure files may be older than the configure.in files
1.49 # if using a snapshot (or even some tarballs). Fake them being
1.50 # up to date.
1.51 - find "${CT_SRC_DIR}/${CT_LIBC_FILE}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
1.52 + find "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
1.53
1.54 return 0
1.55 }
1.56 @@ -139,20 +143,20 @@
1.57 CT_DoLog DEBUG "Using ar for target: '${cross_ar}'"
1.58 CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'"
1.59
1.60 - BUILD_CC="${CT_BUILD}-gcc" \
1.61 - CC=${cross_cc} \
1.62 - CXX=${cross_cxx} \
1.63 - AR=${cross_ar} \
1.64 - RANLIB=${cross_ranlib} \
1.65 - CT_DoExecLog ALL \
1.66 - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \
1.67 - --prefix=/usr \
1.68 - --with-headers="${CT_HEADERS_DIR}" \
1.69 - --build="${CT_BUILD}" \
1.70 - --host="${CT_TARGET}" \
1.71 - --disable-profile \
1.72 - --without-gd \
1.73 - --without-cvs \
1.74 + BUILD_CC="${CT_BUILD}-gcc" \
1.75 + CC=${cross_cc} \
1.76 + CXX=${cross_cxx} \
1.77 + AR=${cross_ar} \
1.78 + RANLIB=${cross_ranlib} \
1.79 + CT_DoExecLog ALL \
1.80 + "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}/configure" \
1.81 + --prefix=/usr \
1.82 + --with-headers="${CT_HEADERS_DIR}" \
1.83 + --build="${CT_BUILD}" \
1.84 + --host="${CT_TARGET}" \
1.85 + --disable-profile \
1.86 + --without-gd \
1.87 + --without-cvs \
1.88 --enable-add-ons
1.89
1.90 CT_DoLog EXTRA "Installing C library headers"
1.91 @@ -241,7 +245,7 @@
1.92 AR=${CT_TARGET}-ar \
1.93 RANLIB=${CT_TARGET}-ranlib \
1.94 CT_DoExecLog ALL \
1.95 - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \
1.96 + "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}/configure" \
1.97 --prefix=/usr \
1.98 --with-headers="${CT_HEADERS_DIR}" \
1.99 --build=${CT_BUILD} \