From 05f123719e5df2f2198143b24f7ccd05862762b9 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 21 Jun 2008 12:13:46 +0000 Subject: [PATCH] Clifford Wolf: Updated gcc-42 (4.2.4) Created gcc-43 (4.3.0) [2008060608132919818] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9052 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/config-300.in | 2 +- package/base/gcc/gcc.conf | 22 ++++++++++++++++++---- package/base/gcc/gcc.desc | 9 +++++++-- package/base/gcc/preconfig.in | 2 +- package/base/gcc/wrappers.in | 14 +++++++------- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/package/base/gcc/config-300.in b/package/base/gcc/config-300.in index 39c507e9f..d49e38ab8 100644 --- a/package/base/gcc/config-300.in +++ b/package/base/gcc/config-300.in @@ -27,7 +27,7 @@ if pkgcheck "gcc=.*" X ; then ROCKCFG_PKG_GCC_STACKPRO 0 include "package/*/*/subconfig-gcc.in" - for gcc_version in 2 32 33 34 40 41 42 ; do + for gcc_version in 2 32 33 34 40 41 42 43; do if eval pkgcheck gcc=gcc${gcc_version} X; then comment ' ' comment "--- gcc${gcc_version} options" diff --git a/package/base/gcc/gcc.conf b/package/base/gcc/gcc.conf index 3d7224d51..2b3d9603d 100644 --- a/package/base/gcc/gcc.conf +++ b/package/base/gcc/gcc.conf @@ -73,8 +73,13 @@ if [ "$pkg_gcc_cross" ] ; then if [ ! -e $root/$prefix/$pkg_gcc_target/lib/crti.o ] ; then echo_status "Building only static gcc because there is no cross-glibc (yet)." var_append confopt " " "--disable-shared --enable-languages=c" - makeopt="all-gcc" - makeinstopt="install-gcc" + if [ $pkg_gcc_version -ge 43 ]; then + makeopt="all-gcc all-target-libgcc" + makeinstopt="install-gcc install-target-libgcc" + else + makeopt="all-gcc" + makeinstopt="install-gcc" + fi else var_append confopt " " "--enable-shared --enable-languages=c,c++" makeopt="" @@ -87,8 +92,13 @@ elif [ $stagelevel -eq 0 ] ; then var_append extraconfopt " \ --with-sysroot=${CLFS} --disable-nls --disable-shared \ --enable-languages=c" - makeopt="all-gcc" - makeinstopt="install-gcc" + if [ $pkg_gcc_version -ge 43 ]; then + makeopt="all-gcc all-target-libgcc" + makeinstopt="install-gcc install-target-libgcc" + else + makeopt="all-gcc" + makeinstopt="install-gcc" + fi elif [ $stagelevel -eq 1 ] ; then configprefix="" confopt="--prefix=${CLFS}/$cross_tools \ @@ -195,6 +205,10 @@ custmain () { eval make $makeinstopt + if [ $stagelevel -eq 0 -a $pkg_gcc_version -ge 43 ]; then + cp -v $root/$prefix/$gcc_lib_dir/include-fixed/*.h $root/$prefix/$gcc_lib_dir/include/ + fi + if [ $stagelevel -ge 2 -a -z "$pkg_gcc_cross" ] ; then # Rename and install binaries # diff --git a/package/base/gcc/gcc.desc b/package/base/gcc/gcc.desc index fc2cb849b..7d8d859b6 100644 --- a/package/base/gcc/gcc.desc +++ b/package/base/gcc/gcc.desc @@ -81,8 +81,13 @@ #endif #if xpkg == gcc42.* -[V] 4.2.2 -[D] 929899940 gcc-4.2.2.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.2/ +[V] 4.2.4 +[D] 4010125392 gcc-4.2.4.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.2.4/ +#endif + +#if xpkg == gcc43.* +[V] 4.3.0 +[D] 2435027611 gcc-4.3.0.tar.bz2 ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.3.0/ #endif [CD] for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done diff --git a/package/base/gcc/preconfig.in b/package/base/gcc/preconfig.in index a5649906f..f60a7825d 100644 --- a/package/base/gcc/preconfig.in +++ b/package/base/gcc/preconfig.in @@ -1,5 +1,5 @@ #!/bin/bash -for x in gcc2 gcc32 gcc33 gcc34 gcc40 gcc41 gcc42 ; do +for x in gcc2 gcc32 gcc33 gcc34 gcc40 gcc41 gcc42 gcc43; do pkgfork gcc $x # GCC 2.x and 3.2.x cannot be used as the default C/C++ compilers because they # don't support the --with-sysroot configure option. diff --git a/package/base/gcc/wrappers.in b/package/base/gcc/wrappers.in index c202c02df..fe115713a 100644 --- a/package/base/gcc/wrappers.in +++ b/package/base/gcc/wrappers.in @@ -42,15 +42,15 @@ gcc_build_wrapper() { done } -gcc_build_wrapper CC ${arch_target}-cc ${arch_target}-gcc{-2,-32,-33,-34,-40,-41,-42,} -gcc_build_wrapper CXX ${arch_target}-{g++,c++}{-2,-32,-33,-34,-40,-41,-42,} -gcc_build_wrapper KCC ${arch_target}-kcc{-2,-32,-33,-34,-40,-41,-42,} +gcc_build_wrapper CC ${arch_target}-cc ${arch_target}-gcc{-2,-32,-33,-34,-40,-41,-42,-43,} +gcc_build_wrapper CXX ${arch_target}-{g++,c++}{-2,-32,-33,-34,-40,-41,-42,-43,} +gcc_build_wrapper KCC ${arch_target}-kcc{-2,-32,-33,-34,-40,-41,-42,-43,} if [ $stagelevel -ge 3 ]; then - gcc_build_wrapper CC cc gcc{-2,-32,-33,-34,-40,-41,-42,} - gcc_build_wrapper CXX {c,g}++{-2,-32,-33,-34,-40,-41,-42,} - gcc_build_wrapper F77 {g,f}77{-2,-32,-33,-34,-40,-41,-42,} - gcc_build_wrapper KCC kcc{-2,-32,-33,-34,-40,-41,-42,} + gcc_build_wrapper CC cc gcc{-2,-32,-33,-34,-40,-41,-42,-43,} + gcc_build_wrapper CXX {c,g}++{-2,-32,-33,-34,-40,-41,-42,-43,} + gcc_build_wrapper F77 {g,f}77{-2,-32,-33,-34,-40,-41,-42,-43,} + gcc_build_wrapper KCC kcc{-2,-32,-33,-34,-40,-41,-42,-43,} fi if [ $stagelevel -le 2 ]; then