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

Comparing COMP/CMSDIST/gcc-toolfile.spec (file contents):
Revision 1.2 by elmer, Fri Jan 4 02:03:48 2008 UTC vs.
Revision 1.13 by elmer, Wed Sep 23 16:15:34 2009 UTC

# Line 1 | Line 1
1 < ### RPM cms gcc-toolfile 1.0
1 > ### RPM cms gcc-toolfile 4.3.2
2  
3   # gcc has a separate spec file for the generating a
4   # toolfile because gcc.spec could be not build because of the
# Line 14 | Line 14 | if [ "X$GCC_ROOT" = X ]
14   then
15      GCC_PATH=`which gcc` || exit 1
16      GCC_ROOT=`echo $GCC_PATH | sed -e 's|/bin/gcc||'`
17 <    GCC_VERSION=`gcc -v 2>&1 | grep "gcc version" | sed 's|.*\([0-9].[0-9].[0-9]\).*|\1|'` || exit 1
17 >    GCC_VERSION=`gcc -v 2>&1 | grep "gcc version" | sed 's|[^0-9]*\([0-9].[0-9].[0-9]\).*|\1|'` || exit 1
18   fi
19  
20   COMPILER_VERSION=`echo %cmsplatf | sed -e 's|.*gcc\([0-9]*\).*|\1|'`
21   COMPILER_VERSION_MAJOR=`echo %cmsplatf | sed -e 's|.*gcc\([0-9]\).*|\1|'`
22  
23   case %cmsplatf in
24 slc3* )
25 cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
26 <doc type=BuildSystem::ToolDoc version=1.1>
27 <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
28 <client>
29 <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
30 <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
31 <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
32 </client>
33 <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
34 <Flags CCcompiler="gcc@COMPILER_VERSION_MAJOR@">
35 <Flags MODULEFLAGS="-shared">
36 <Flags CXXDEBUGFLAG="-g">
37 <Flags CPPDEFINES="GNU_GCC">
38 <Flags CPPDEFINES="_GNU_SOURCE">
39 <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
40 <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
41 <Flags CXXFLAGS="-O2">
42 <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
43 <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
44 <Flags LDFLAGS="-Wl,-E">
45 <Flags CXXSHAREDFLAGS="-Wl,-E">
46 <Flags SHAREDSUFFIX="so">
47 <Flags SCRAM_LANGUAGE_TYPE="C++">
48 <Runtime name=GCC_EXEC_PREFIX default="$GCC_BASE/lib/gcc-lib/">
49 <Runtime name=LD_LIBRARY_PATH value="$GCC_BASE/lib" type=path>
50 <Runtime name=PATH value="$GCC_BASE/bin" type=path>
51 </tool>
52 EOF_TOOLFILE
53 cat << \EOF_TOOLFILE >%i/etc/scram.d/ccompiler
54 <doc type=BuildSystem::ToolDoc version=1.1>
55 <tool name=ccompiler version=@GCC_VERSION@ type=compiler>
56 <client>
57 <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
58 <Environment name=GCCBINDIR value="$GCC_BASE/bin"></Environment>
59 <Environment name=CC value="$GCCBINDIR/gcc"></Environment>
60 </client>
61 <Flags CDEBUGFLAG="-g">
62 <Flags CSHAREDOBJECTFLAGS="-fPIC">
63 <Flags CFLAGS="-pthread">
64 <Flags CFLAGS="-O2">
65 <Flags LDFLAGS="-Wl,-E">
66 <Flags CSHAREDFLAGS="-Wl,-E">
67 <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
68 <Flags SCRAM_LANGUAGE_TYPE="C">
69 </tool>
70 EOF_TOOLFILE
71 cat << \EOF_TOOLFILE >%i/etc/scram.d/f77compiler
72 <doc type=BuildSystem::ToolDoc version=1.1>
73 <tool name=f77compiler version=@GCC_VERSION@ type=compiler>
74 <lib name=g2c>
75 <lib name=m>
76 <client>
77 <Environment name=G77_BASE default="@GCC_ROOT@"></Environment>
78 <Environment name=FC default="$G77_BASE/bin/g77"></Environment>
79 </client>
80 <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
81 <Flags FFLAGS="-fno-second-underscore -Wno-globals -Wunused -Wuninitialized">
82 <Flags FCO2Flag="-O2">
83 <Flags FCOPTIMISED="-O2">
84 <Flags FCDEBUGFLAG="-g">
85 <Flags FCSHAREDOBJECTFLAGS="-fPIC">
86 <Flags SCRAM_LANGUAGE_TYPE="FORTRAN">
87 </tool>
88 EOF_TOOLFILE
89 ;;
24   slc4_ia32_gcc345 )
25   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
26   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 152 | Line 86 | cat << \EOF_TOOLFILE >%i/etc/scram.d/f77
86   </tool>
87   EOF_TOOLFILE
88   ;;
89 < slc4_ia32_gcc4* )
89 > slc4_ia32_gcc4* | slc5_ia32_gcc4*)
90   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
91   <doc type=BuildSystem::ToolDoc version=1.1>
92   <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
# Line 169 | Line 103 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
103   <Flags CPPDEFINES="_GNU_SOURCE">
104   <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
105   <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
106 < <Flags CXXFLAGS="-O2">
106 > <Flags CXXFLAGS="-O2 -fvisibility-inlines-hidden">
107   <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
108 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
108 > <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses -Werror=array-bounds -Wno-deprecated">
109   <Flags LDFLAGS="-Wl,-E">
110   <Flags CXXSHAREDFLAGS="-Wl,-E">
111   <Flags SHAREDSUFFIX="so">
# Line 217 | Line 151 | cat << \EOF_TOOLFILE >%i/etc/scram.d/f77
151   </tool>
152   EOF_TOOLFILE
153   ;;
154 < slc4_amd64_* )
154 > slc4_amd64_gcc4* | slc5_amd64_gcc4* )
155   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
156   <doc type=BuildSystem::ToolDoc version=1.1>
157   <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
# Line 236 | Line 170 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
170   <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
171   <Flags CXXFLAGS="-O2">
172   <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
173 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
173 > <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses -Werror=array-bounds -Wno-deprecated">
174   <Flags LDFLAGS="-Wl,-E">
175   <Flags CXXSHAREDFLAGS="-Wl,-E">
176   <Flags SHAREDSUFFIX="so">
# Line 266 | Line 200 | EOF_TOOLFILE
200   cat << \EOF_TOOLFILE >%i/etc/scram.d/f77compiler
201   <doc type=BuildSystem::ToolDoc version=1.1>
202   <tool name=f77compiler version=@GCC_VERSION@ type=compiler>
203 < <lib name=g2c>
203 > <lib name=gfortran>
204   <lib name=m>
205   <client>
206   <Environment name=G77_BASE default="@GCC_ROOT@"></Environment>
207 < <Environment name=FC default="$G77_BASE/bin/g77"></Environment>
207 > <Environment name=FC default="$G77_BASE/bin/gfortran"></Environment>
208   </client>
209   <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
210 < <Flags FFLAGS="-fno-second-underscore -Wno-globals -Wunused -Wuninitialized">
210 > <Flags FFLAGS="-fno-second-underscore -Wunused -Wuninitialized">
211   <Flags FCO2Flag="-O2">
212   <Flags FCOPTIMISED="-O2">
213   <Flags FCDEBUGFLAG="-g">
# Line 282 | Line 216 | cat << \EOF_TOOLFILE >%i/etc/scram.d/f77
216   </tool>
217   EOF_TOOLFILE
218   ;;
219 < osx104_ppc32_gcc40* )
286 < cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
287 < <doc type=BuildSystem::ToolDoc version=1.1>
288 < <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
289 < <client>
290 < <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
291 < <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
292 < <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
293 < </client>
294 < <Flags SCRAM_COMPILER_NAME="gcc40">
295 < <Flags CCcompiler="gcc40">
296 < <Flags MODULEFLAGS=" ">
297 < <Flags CXXDEBUGFLAG="-g">
298 < <Flags CPPDEFINES="GNU_GCC">
299 < <Flags CPPDEFINES="_GNU_SOURCE">
300 < <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
301 < <Flags CXXFLAGS="-pedantic -ansi -pipe">
302 < <Flags CXXFLAGS="-O2">
303 < <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
304 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
305 < <Flags LDFLAGS=" ">
306 < <Flags CXXSHAREDFLAGS="-dynamiclib -single_module">
307 < <Flags SHAREDSUFFIX="dylib">
308 < <Flags SCRAM_LANGUAGE_TYPE="C++">
309 < <Runtime name=DYLD_LIBRARY_PATH value="$GCC_BASE/lib" type=path>
310 < <Runtime name=PATH value="$GCC_BASE/bin" type=path>
311 < </tool>
312 < EOF_TOOLFILE
313 < ;;
314 < osx104_ia32_gcc40* )
315 < cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
316 < <doc type=BuildSystem::ToolDoc version=1.1>
317 < <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
318 < <client>
319 < <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
320 < <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
321 < <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
322 < </client>
323 < <Flags SCRAM_COMPILER_NAME="gcc40">
324 < <Flags CCcompiler="gcc40">
325 < <Flags MODULEFLAGS=" ">
326 < <Flags CXXDEBUGFLAG="-g">
327 < <Flags CPPDEFINES="GNU_GCC">
328 < <Flags CPPDEFINES="_GNU_SOURCE">
329 < <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
330 < <Flags CXXFLAGS="-pedantic -ansi -pipe">
331 < <Flags CXXFLAGS="-O2">
332 < <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
333 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
334 < <Flags LDFLAGS=" ">
335 < <Flags CXXSHAREDFLAGS="-dynamiclib -single_module">
336 < <Flags SHAREDSUFFIX="dylib">
337 < <Flags SCRAM_LANGUAGE_TYPE="C++">
338 < <Runtime name=DYLD_LIBRARY_PATH value="$GCC_BASE/lib" type=path>
339 < <Runtime name=PATH value="$GCC_BASE/bin" type=path>
340 < </tool>
341 < EOF_TOOLFILE
342 < ;;
343 < osx105* )
219 > osx104_ppc32_gcc40* | osx104_ia32_gcc40* | osx105* )
220   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
221   <doc type=BuildSystem::ToolDoc version=1.1>
222   <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines