Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 18 years ago
parent
commit
05f123719e
5 changed files with 34 additions and 15 deletions
  1. +1
    -1
      package/base/gcc/config-300.in
  2. +18
    -4
      package/base/gcc/gcc.conf
  3. +7
    -2
      package/base/gcc/gcc.desc
  4. +1
    -1
      package/base/gcc/preconfig.in
  5. +7
    -7
      package/base/gcc/wrappers.in

+ 1
- 1
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"

+ 18
- 4
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
#

+ 7
- 2
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] <COPY> for x in $cachedir/*.cache; do cp $x $confdir/$pkg.cache; done

+ 1
- 1
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.

+ 7
- 7
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

Loading…
Cancel
Save