From 55b81e900e97671d3c0341f2a331c7002d570233 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 8 Nov 2007 21:18:53 +0000 Subject: [PATCH] Clifford Wolf: Updated glibc (2.7) Some glibc-2.7 related package fixes x86: set lowest supported optimization level to 486 [2007110415311420171] git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8813 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- architecture/x86/archtest.out | 4 +-- architecture/x86/config.in | 1 - architecture/x86/gcc-options | 2 +- architecture/x86/kernel.conf.sh | 3 +- package/base/gcc/parse-config | 54 ++++++++++++++++++-------------- package/base/glibc/config-400.in | 5 +-- package/base/glibc/glibc.desc | 9 +++++- 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/architecture/x86/archtest.out b/architecture/x86/archtest.out index 324cb50c7..2d569a90a 100644 --- a/architecture/x86/archtest.out +++ b/architecture/x86/archtest.out @@ -4,5 +4,5 @@ arch_sizeof_long=4 arch_sizeof_long_long=8 arch_sizeof_char_p=4 arch_bigendian=no -arch_machine=i386 -arch_target=i386-unknown-linux-gnu +arch_machine=i486 +arch_target=i486-unknown-linux-gnu diff --git a/architecture/x86/config.in b/architecture/x86/config.in index 67703efc0..978e84860 100644 --- a/architecture/x86/config.in +++ b/architecture/x86/config.in @@ -29,7 +29,6 @@ choice ROCKCFG_X86_BITS 32 \ if [ "$ROCKCFG_X86_BITS" = 32 ] ; then choice ROCKCFG_X86_OPT generic \ generic "No special optimisation" \ - i386 "Optimised for Intel 386" \ i486 "Optimised for Intel 486" \ via-c3 "Optimised for VIA CyrixIII/VIA-C3" \ via-c3-improved "Improved for VIA CyrixIII/VIA-C3" \ diff --git a/architecture/x86/gcc-options b/architecture/x86/gcc-options index 1f042e8be..89f374c94 100644 --- a/architecture/x86/gcc-options +++ b/architecture/x86/gcc-options @@ -38,7 +38,7 @@ then esac case "$ROCKCFG_X86_OPT" in - i386|i486) + i486) var_append GCC2_WRAPPER_INSERT " " "-march=$ROCKCFG_X86_OPT" ;; pentium|pentium-mmx) var_append GCC2_WRAPPER_INSERT " " "-march=pentium" ;; diff --git a/architecture/x86/kernel.conf.sh b/architecture/x86/kernel.conf.sh index 5aebf1a6a..3682d1acd 100644 --- a/architecture/x86/kernel.conf.sh +++ b/architecture/x86/kernel.conf.sh @@ -10,8 +10,7 @@ if [ "$ROCKCFG_X86_BITS" = 32 ] ; then linux_arch="M486" - for x in "i386 M386" \ - "i486 M486" \ + for x in "i486 M486" \ "via-c3 MCYRIXIII" \ "via-c3-2 MVIAC3_2" \ "pentium M586" \ diff --git a/package/base/gcc/parse-config b/package/base/gcc/parse-config index c3ddc85d8..eb9185658 100644 --- a/package/base/gcc/parse-config +++ b/package/base/gcc/parse-config @@ -120,36 +120,44 @@ if [ "$ROCKCFG_OPT" != default ] ; then var_insert GCC_WRAPPER_REMOVE " " "-O -O[0-9s]" fi -case "$ROCKCFG_OPT" in - smart) - var_insert GCC_WRAPPER_INSERT " " "-SPEED-O2 -SIZE-Os -pipe" - var_insert GCC_WRAPPER_FILTER "|" "gawk -f $base/misc/tools-source/smartwr.awk $base/scripts/smart_db.txt -" +case "$pkg" in + glibc*) + # do not mess with glibc -O options other than this + var_insert GCC_WRAPPER_INSERT " " "-O2 -pipe" ;; - bizarre) - var_insert GCC_WRAPPER_INSERT " " "-SPEED-Os -SIZE-O2 -pipe" - var_insert GCC_WRAPPER_FILTER "|" "gawk -f $base/misc/tools-source/smartwr.awk $base/scripts/smart_db.txt -" - ;; - speed) - var_insert GCC_WRAPPER_INSERT " " "-O2 -pipe" - ;; - size) - var_insert GCC_WRAPPER_INSERT " " "-Os -pipe" - ;; - lazy) - var_insert GCC_WRAPPER_INSERT " " "-O1 -pipe" - ;; - test) - case "$pkg" in - gcc*|glibc*|binutils*|make|bzip2|gzip|coreutils|bash*|gawk|sed) + *) + case "$ROCKCFG_OPT" in + smart) + var_insert GCC_WRAPPER_INSERT " " "-SPEED-O2 -SIZE-Os -pipe" + var_insert GCC_WRAPPER_FILTER "|" "gawk -f $base/misc/tools-source/smartwr.awk $base/scripts/smart_db.txt -" + ;; + bizarre) + var_insert GCC_WRAPPER_INSERT " " "-SPEED-Os -SIZE-O2 -pipe" + var_insert GCC_WRAPPER_FILTER "|" "gawk -f $base/misc/tools-source/smartwr.awk $base/scripts/smart_db.txt -" + ;; + speed) + var_insert GCC_WRAPPER_INSERT " " "-O2 -pipe" + ;; + size) var_insert GCC_WRAPPER_INSERT " " "-Os -pipe" ;; - *) + lazy) var_insert GCC_WRAPPER_INSERT " " "-O1 -pipe" ;; + test) + case "$pkg" in + gcc*|binutils*|make|bzip2|gzip|coreutils|bash*|gawk|sed) + var_insert GCC_WRAPPER_INSERT " " "-Os -pipe" + ;; + *) + var_insert GCC_WRAPPER_INSERT " " "-O1 -pipe" + ;; + esac + ;; + default) + ;; esac ;; - default) - ;; esac diff --git a/package/base/glibc/config-400.in b/package/base/glibc/config-400.in index 20516c842..f42639e73 100644 --- a/package/base/glibc/config-400.in +++ b/package/base/glibc/config-400.in @@ -37,8 +37,9 @@ then ROCKCFGSET_PKG_GLIBC22_USEIT=1 fi - choice ROCKCFG_PKG_GLIBC_BRANCH glibc26 \ - glibc26 'Use glibc-2.6 (recommended)' \ + choice ROCKCFG_PKG_GLIBC_BRANCH glibc27 \ + glibc27 'Use glibc-2.7 (recommended)' \ + glibc26 'Use glibc-2.6' \ glibc25 'Use glibc-2.5' \ glibc23 'Use glibc-2.3.x' \ glibc22 'Use glibc-2.2.x' diff --git a/package/base/glibc/glibc.desc b/package/base/glibc/glibc.desc index d34e5125f..4487882cd 100644 --- a/package/base/glibc/glibc.desc +++ b/package/base/glibc/glibc.desc @@ -69,5 +69,12 @@ [D] 1906445728 glibc-libidn-2.6.1.tar.gz http://ftp.gnu.org/gnu/glibc/ #endif -[CD] cp $cachedir/glibc2[2356].cache $confdir/$pkg.cache +#if xpkg == glibc27.* +[V] 2.7 +[D] 112155080 glibc-2.7.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 558189549 glibc-ports-2.7.tar.bz2 http://ftp.gnu.org/gnu/glibc/ +[D] 2295153412 glibc-libidn-2.7.tar.gz http://ftp.gnu.org/gnu/glibc/ +#endif + +[CD] cp $cachedir/glibc2[23567].cache $confdir/$pkg.cache