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.9 by elmer, Wed Jul 22 17:32:57 2009 UTC vs.
Revision 1.13 by elmer, Wed Sep 23 16:15:34 2009 UTC

# Line 21 | Line 21 | COMPILER_VERSION=`echo %cmsplatf | sed -
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 171 | Line 105 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
105   <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
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 -Werror=array-bounds">
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   ;;
220 – slc4_amd64_gcc3* | slc5_amd64_gcc3* )
221 – cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
222 – <doc type=BuildSystem::ToolDoc version=1.1>
223 – <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
224 – <client>
225 – <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
226 – <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
227 – <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
228 – </client>
229 – <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
230 – <Flags CCcompiler="gcc@COMPILER_VERSION_MAJOR@">
231 – <Flags MODULEFLAGS="-shared">
232 – <Flags CXXDEBUGFLAG="-g">
233 – <Flags CPPDEFINES="GNU_GCC">
234 – <Flags CPPDEFINES="_GNU_SOURCE">
235 – <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
236 – <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
237 – <Flags CXXFLAGS="-O2">
238 – <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
239 – <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
240 – <Flags LDFLAGS="-Wl,-E">
241 – <Flags CXXSHAREDFLAGS="-Wl,-E">
242 – <Flags SHAREDSUFFIX="so">
243 – <Flags SCRAM_LANGUAGE_TYPE="C++">
244 – <Runtime name=LD_LIBRARY_PATH value="$GCC_BASE/lib64" type=path>
245 – <Runtime name=PATH value="$GCC_BASE/bin" type=path>
246 – </tool>
247 – EOF_TOOLFILE
248 – cat << \EOF_TOOLFILE >%i/etc/scram.d/ccompiler
249 – <doc type=BuildSystem::ToolDoc version=1.1>
250 – <tool name=ccompiler version=@GCC_VERSION@ type=compiler>
251 – <client>
252 – <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
253 – <Environment name=GCCBINDIR value="$GCC_BASE/bin"></Environment>
254 – <Environment name=CC value="$GCCBINDIR/gcc"></Environment>
255 – </client>
256 – <Flags CDEBUGFLAG="-g">
257 – <Flags CSHAREDOBJECTFLAGS="-fPIC">
258 – <Flags CFLAGS="-pthread">
259 – <Flags CFLAGS="-O2">
260 – <Flags LDFLAGS="-Wl,-E">
261 – <Flags CSHAREDFLAGS="-Wl,-E">
262 – <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
263 – <Flags SCRAM_LANGUAGE_TYPE="C">
264 – </tool>
265 – EOF_TOOLFILE
266 – cat << \EOF_TOOLFILE >%i/etc/scram.d/f77compiler
267 – <doc type=BuildSystem::ToolDoc version=1.1>
268 – <tool name=f77compiler version=@GCC_VERSION@ type=compiler>
269 – <lib name=g2c>
270 – <lib name=m>
271 – <client>
272 – <Environment name=G77_BASE default="@GCC_ROOT@"></Environment>
273 – <Environment name=FC default="$G77_BASE/bin/g77"></Environment>
274 – </client>
275 – <Flags SCRAM_COMPILER_NAME="gcc@COMPILER_VERSION@">
276 – <Flags FFLAGS="-fno-second-underscore -Wno-globals -Wunused -Wuninitialized">
277 – <Flags FCO2Flag="-O2">
278 – <Flags FCOPTIMISED="-O2">
279 – <Flags FCDEBUGFLAG="-g">
280 – <Flags FCSHAREDOBJECTFLAGS="-fPIC">
281 – <Flags SCRAM_LANGUAGE_TYPE="FORTRAN">
282 – </tool>
283 – EOF_TOOLFILE
284 – ;;
154   slc4_amd64_gcc4* | slc5_amd64_gcc4* )
155   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
156   <doc type=BuildSystem::ToolDoc version=1.1>
# Line 301 | 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 -Werror=array-bounds">
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 347 | Line 216 | cat << \EOF_TOOLFILE >%i/etc/scram.d/f77
216   </tool>
217   EOF_TOOLFILE
218   ;;
219 < osx104_ppc32_gcc40* )
351 < cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
352 < <doc type=BuildSystem::ToolDoc version=1.1>
353 < <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
354 < <client>
355 < <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
356 < <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
357 < <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
358 < </client>
359 < <Flags SCRAM_COMPILER_NAME="gcc40">
360 < <Flags CCcompiler="gcc40">
361 < <Flags MODULEFLAGS=" ">
362 < <Flags CXXDEBUGFLAG="-g">
363 < <Flags CPPDEFINES="GNU_GCC">
364 < <Flags CPPDEFINES="_GNU_SOURCE">
365 < <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
366 < <Flags CXXFLAGS="-pedantic -ansi -pipe">
367 < <Flags CXXFLAGS="-O2">
368 < <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
369 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
370 < <Flags LDFLAGS=" ">
371 < <Flags CXXSHAREDFLAGS="-dynamiclib -single_module">
372 < <Flags SHAREDSUFFIX="dylib">
373 < <Flags SCRAM_LANGUAGE_TYPE="C++">
374 < <Runtime name=DYLD_LIBRARY_PATH value="$GCC_BASE/lib" type=path>
375 < <Runtime name=PATH value="$GCC_BASE/bin" type=path>
376 < </tool>
377 < EOF_TOOLFILE
378 < ;;
379 < osx104_ia32_gcc40* )
380 < cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
381 < <doc type=BuildSystem::ToolDoc version=1.1>
382 < <tool name=cxxcompiler version=@GCC_VERSION@ type=compiler>
383 < <client>
384 < <Environment name=GCC_BASE default="@GCC_ROOT@"></Environment>
385 < <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
386 < <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
387 < </client>
388 < <Flags SCRAM_COMPILER_NAME="gcc40">
389 < <Flags CCcompiler="gcc40">
390 < <Flags MODULEFLAGS=" ">
391 < <Flags CXXDEBUGFLAG="-g">
392 < <Flags CPPDEFINES="GNU_GCC">
393 < <Flags CPPDEFINES="_GNU_SOURCE">
394 < <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
395 < <Flags CXXFLAGS="-pedantic -ansi -pipe">
396 < <Flags CXXFLAGS="-O2">
397 < <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
398 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
399 < <Flags LDFLAGS=" ">
400 < <Flags CXXSHAREDFLAGS="-dynamiclib -single_module">
401 < <Flags SHAREDSUFFIX="dylib">
402 < <Flags SCRAM_LANGUAGE_TYPE="C++">
403 < <Runtime name=DYLD_LIBRARY_PATH value="$GCC_BASE/lib" type=path>
404 < <Runtime name=PATH value="$GCC_BASE/bin" type=path>
405 < </tool>
406 < EOF_TOOLFILE
407 < ;;
408 < 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