ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/gcc.spec
(Generate patch)

Comparing COMP/CMSDIST/gcc.spec (file contents):
Revision 1.41 by elmer, Thu Jan 3 14:57:18 2008 UTC vs.
Revision 1.49 by eulisse, Fri May 29 08:46:10 2009 UTC

# Line 1 | Line 1
1 < ### RPM external gcc 4.2.2-CMS19
1 > ### RPM external gcc 4.3.2
2 > ## BUILDIF case `uname`:`uname -p` in Linux:i*86 ) true ;; Linux:x86_64 ) true ;;  Linux:ppc64 ) false ;; Darwin:* ) false ;; * ) true ;; esac
3   ## INITENV +PATH LD_LIBRARY_PATH %i/lib/32
4   ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
4 ## BUILDIF case $(uname):$(uname -p) in Linux:i*86 ) true ;; Linux:x86_64 ) true ;;  Linux:ppc64 ) false ;; Darwin:* ) false ;; * ) true ;; esac
5   Source0: ftp://ftp.fu-berlin.de/unix/gnu/%n/%n-%realversion/%n-%realversion.tar.bz2
6 < %define binutilsv 2.17
7 < Source1: http://ftp.gnu.org/gnu/binutils/binutils-%binutilsv.tar.bz2
6 > %if "%(echo %cmsos | cut -f2 -d_)" == "amd64"
7 > %define binutilsv 2.19.1
8 > Source3: http://ftp.gnu.org/gnu/binutils/binutils-%binutilsv.tar.bz2
9 > %endif
10 >
11  
12   # If gcc version >= 4.0.0, we need two additional sources, for gmp and mpfr,
13   # and we set the fortranCompiler macro (which is going to be used by the
14   # --enable-languages option of gcc's configure) to gfortran.
15   # Notice that we need to build those twice: once using the system compiler
16   # and the using the newly built gcc.
17 < %define gmpVersion 4.2.1
18 < %define mpfrVersion 2.2.1
19 < Source2: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmpVersion}.tar.bz2
20 < Source3: http://www.mpfr.org/mpfr-%{mpfrVersion}/mpfr-%{mpfrVersion}.tar.bz2
17 > %define gmpVersion 4.2.4
18 > %define mpfrVersion 2.3.2
19 > Source1: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmpVersion}.tar.bz2
20 > Source2: http://www.mpfr.org/mpfr-%{mpfrVersion}/mpfr-%{mpfrVersion}.tar.bz2
21 > Patch0: binutils-2.19.1-fix-gold
22  
23   %define cpu %(echo %cmsplatf | cut -d_ -f2)
24   %define gcc_major %(echo %realversion | cut -f1 -d.)
25   %prep
26   %setup -T -b 0 -n gcc-%realversion
27  
28 < %if "%cmsos" == "slc4_ia32"
28 > case %cmsos in
29 >  "slc4_ia32" | "slc5_ia32" )
30   cat << \EOF_CONFIG_GCC >> gcc/config.gcc
31   # CMS patch to include gcc/config/i386/t-cms when building gcc
32   tm_file="$tm_file i386/cms.h"
# Line 44 | Line 49 | MULTILIB_OPTIONS = m32
49   MULTILIB_DIRNAMES = ../lib
50   MULTILIB_MATCHES = m32=m32
51   EOF_T_CMS
52 +  ;;
53 + esac
54 +
55 + %if "%{?binutilsv:set}" == "set"
56 + %setup -D -T -b 3 -n binutils-%binutilsv
57 + %patch0 -p1
58 + case %cmsos in
59 +  slc*_amd64 )
60 +    # This patches the default linker script to align stuff at 4096 kB boundaries rather
61 +    # than the default 2MB (MAXPAGESIZE value for x86_64 architecture).
62 +    perl -p -i -e 's|\$[{]MAXPAGESIZE[}]|4096|g;s|\$[{]SEGMENT_SIZE[}]|4096|g' ld/scripttempl/elf.sc
63 +  ;;
64 + esac
65   %endif
66  
67 < %setup -D -T -b 1 -n binutils-%binutilsv
68 < %setup -D -T -b 2 -n gmp-%{gmpVersion}
51 < %setup -D -T -b 3 -n mpfr-%{mpfrVersion}
67 > %setup -D -T -b 1 -n gmp-%{gmpVersion}
68 > %setup -D -T -b 2 -n mpfr-%{mpfrVersion}
69  
70   %build
71   # Set special variables required to build 32-bit executables on 64-bit
# Line 58 | Line 75 | EOF_T_CMS
75   case $(uname -m):%{cmsos} in
76    *:slc4_ia32 )
77      CCOPTS="-m32 -Wa,--32" ;;
78 +  *:slc5_ia32 )
79 +    CCOPTS="-m32 -Wa,--32" ;;
80    * )
81      CCOPTS="" ;;
82   esac
83  
84   # If requested, build our own binutils.  Currently the default is to use
85   # the system binutils.
86 < %if "%{?use_external_binutils:set}" == "set"
86 > %if "%{?binutilsv:set}" == "set"
87   cd ../binutils-%{binutilsv}
88 < CC="gcc $CCOPTS" ./configure --prefix=%i
88 > CC="gcc $CCOPTS" ./configure --prefix=%i --enable-gold
89   make %makeprocesses
90   make install
91   %endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines