diff --git a/package/base/glibc/glibc.conf b/package/base/glibc/glibc.conf index bd318b715..0fdd7c136 100644 --- a/package/base/glibc/glibc.conf +++ b/package/base/glibc/glibc.conf @@ -47,11 +47,12 @@ esac pkg_glibc_linuxthreads=1 [ "$ROCKCFG_PKG_GLIBC23_LINUXTHREADS" = "0" ] && pkg_glibc_linuxthreads=0 -[[ $xpkg = *24 ]] && pkg_glibc_linuxthreads=0 # fall back to linuxthreads for cross glibcs [ -n "$pkg_glibc_cross" ] && pkg_glibc_linuxthreads=1 +[ "${pkg_glibc_version}" = "24" ] && pkg_glibc_linuxthreads=0 + # Give a more descriptive error message than the one that would happen during the build. kernel_mainline="`uname -r | cut -f-2 -d'.'`" if [ $pkg_glibc_linuxthreads = 0 -a "$kernel_mainline" != "2.6" ] ; then @@ -369,6 +370,10 @@ glibc_prepatch() { if [ $pkg_glibc_linuxthreads = 1 -a -f $archdir/*linuxthreads*.tar.bz2 ]; then tar $taropt $archdir/*linuxthreads*.tar.bz2 fi + if [ "${pkg_glibc_version}" = "24" ] ; then + echo "extracting glibc-ports" + tar $taropt $archdir/glibc-ports-2.4*.tar.bz2 + fi } glibc_stage0() { diff --git a/package/base/glibc/glibc.desc b/package/base/glibc/glibc.desc index 4ac9e9d8e..3adfc5c98 100644 --- a/package/base/glibc/glibc.desc +++ b/package/base/glibc/glibc.desc @@ -58,6 +58,7 @@ #if xpkg == glibc24.* [V] 2.4 [D] 1764169258 glibc-2.4.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 1792690402 glibc-ports-2.4.tar.bz2 http://ftp.gnu.org/gnu/glibc/ #endif [CD] cp $cachedir/glibc2[23].cache $confdir/$pkg.cache