From 0107c23be194f0a2f44347d90537c322ac75d55c Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 23 May 2007 20:31:49 +0000 Subject: [PATCH] Clifford Wolf: Updated default glibc (2.5) and default gcc (4.2) [2007052013054010827] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8463 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/config-300.in | 4 ++-- package/base/glibc/config-400.in | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/base/gcc/config-300.in b/package/base/gcc/config-300.in index b57aa5b41..5a1153267 100644 --- a/package/base/gcc/config-300.in +++ b/package/base/gcc/config-300.in @@ -28,9 +28,9 @@ then bool 'Building gcc 3.2.x package' ROCKCFG_PKG_GCC_GCC32 0 bool 'Building gcc 3.3.x package' ROCKCFG_PKG_GCC_GCC33 0 bool 'Building gcc 3.4.x package' ROCKCFG_PKG_GCC_GCC34 0 - bool 'Building gcc 4.0.x package' ROCKCFG_PKG_GCC_GCC40 1 + bool 'Building gcc 4.0.x package' ROCKCFG_PKG_GCC_GCC40 0 bool 'Building gcc 4.1.x package' ROCKCFG_PKG_GCC_GCC41 0 - bool 'Building gcc 4.2.x package' ROCKCFG_PKG_GCC_GCC42 0 + bool 'Building gcc 4.2.x package' ROCKCFG_PKG_GCC_GCC42 1 d="none" ; l="" ; m="" if [ $ROCKCFG_PKG_GCC_GCC2 = 1 ]; then pkgfork gcc gcc2; d="gcc2"; l="$l $d"; fi diff --git a/package/base/glibc/config-400.in b/package/base/glibc/config-400.in index 77e140a4e..62dca41e9 100644 --- a/package/base/glibc/config-400.in +++ b/package/base/glibc/config-400.in @@ -36,9 +36,9 @@ then ROCKCFGSET_PKG_GLIBC22_USEIT=1 fi - choice ROCKCFG_PKG_GLIBC_BRANCH glibc23 \ - glibc23 'Use glibc-2.3.x (recommended)' \ - glibc25 'Use glibc-2.5 (for testing)' \ + choice ROCKCFG_PKG_GLIBC_BRANCH glibc25 \ + glibc25 'Use glibc-2.5 (recommended)' \ + glibc23 'Use glibc-2.3.x' \ glibc22 'Use glibc-2.2.x' if [ "$ROCKCFG_PKG_GLIBC_BRANCH" = "glibc22" ] ; then @@ -47,7 +47,7 @@ then bool 'Use old-style linuxthreads instead of NPTL' \ ROCKCFG_PKG_GLIBC23_LINUXTHREADS 0 fi - + pkgfork glibc $ROCKCFG_PKG_GLIBC_BRANCH pkgremove glibc