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

Comparing COMP/CMSDIST/onlinesystemtools.spec (file contents):
Revision 1.4 by ratnik, Wed Mar 4 16:33:57 2009 UTC vs.
Revision 1.6 by andreasp, Sat Nov 7 07:47:17 2009 UTC

# Line 4 | Line 4 | Source: none
4   # Here we are assuming that online release always uses system compiler:
5   %define compilertools ccompiler cxxcompiler f77compiler jcompiler
6  
7 – %if "%cmsplatf" == "slc4onl_ia32_gcc346"
7   #%define onlinetools curl libpng libtiff libungif mimetic mysql openssl oracle python elementtree qt xdaq xerces zlib
8   %define onlinetools zlib curl oracle openssl xerces-c xdaq mimetic
9   # Define variables used in non-scram-managed tools, that would be
10   # normally defined in package's init.sh/csh scrips.
11   # Set all versions as currently found on the system.
12 < %define compiler_version                3.4.6
12 > %define compiler_version                4.3.4
13   ## INITENV SET CXXCOMPILER_VERSION      %compiler_version
14   ## INITENV SET CCOMPILER_VERSION        %compiler_version
15   ## INITENV SET F77COMPILER_VERSION      %compiler_version
# Line 18 | Line 17 | Source: none
17   ## INITENV SET CURL_VERSION             %curl_version
18   %define zlib_version                    1.2.1.2
19   ## INITENV SET ZLIB_VERSION             %zlib_version
20 < %define oracle_version                  10.2.1
20 > %define oracle_version                  10.2.0.4
21   ## INITENV SET ORACLE_VERSION           %oracle_version
22   ## INITENV SET ORACLE_ROOT              /opt/xdaq
23   %define openssl_version                 0.9.7a
# Line 31 | Line 30 | Source: none
30   ## INITENV SET XDAQ_ROOT                /opt/xdaq
31   %define mimetic_version                 0.9.1
32   ## INITENV SET MIMETIC_VERSION          %mimetic_version
34 – %else
35 – %define onlinetools %{nil}
36 – %endif
33  
34   %define systemtools                     sockets opengl x11 %compilertools %onlinetools
35   %define sockets_version                 1.0
# Line 60 | Line 56 | cat << \EOF_TOOLFILE >%i/etc/scram.d/soc
56   <Tool name=Sockets version=%sockets_version>
57   EOF_TOOLFILE
58   case %cmsplatf in
59 < slc3_* | slc4_* | slc4onl_* )
59 > slc3_* | slc4_* | slc4onl_* | slc5onl_* )
60   cat << \EOF_TOOLFILE >>%i/etc/scram.d/sockets
61   <lib name=nsl>
62   <lib name=crypt>
# Line 142 | Line 138 | cat << \EOF_TOOLFILE >>%i/etc/scram.d/jc
138   </Tool>
139   EOF_TOOLFILE
140  
145 – %if "%cmsplatf" == "slc4onl_ia32_gcc346"
141   #cxxcompiler
142   cat << \EOF_TOOLFILE >%i/etc/scram.d/cxxcompiler
143   <doc type=BuildSystem::ToolDoc version=1.1>
144   <tool name=cxxcompiler version=%compiler_version type=compiler>
145   <client>
146 < <Environment name=GCC_BASE default="/usr"></Environment>
146 > <Environment name=GCC_BASE default="/opt/gcc/slc5onl_ia32_gcc434/external/gcc/4.3.4"></Environment>
147   <Environment name=GCCBINDIR default="$GCC_BASE/bin"></Environment>
148   <Environment name=CXX value="$GCCBINDIR/c++"></Environment>
149   </client>
150 < <Flags SCRAM_COMPILER_NAME="gcc345">
151 < <Flags CCcompiler="gcc3">
150 > <Flags SCRAM_COMPILER_NAME="gcc434">
151 > <Flags CCcompiler="gcc4">
152   <Flags MODULEFLAGS="-shared">
153   <Flags CXXDEBUGFLAG="-g">
154   <Flags CPPDEFINES="GNU_GCC">
# Line 161 | Line 156 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cxx
156   <Flags CXXSHAREDOBJECTFLAGS="-fPIC">
157   <Flags CXXFLAGS="-pedantic -ansi -pthread -pipe">
158   <Flags CXXFLAGS="-O2">
159 < <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300">
160 < <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses">
159 > <Flags CXXFLAGS="-felide-constructors -fmessage-length=0 -ftemplate-depth-300  ">
160 > <Flags CXXFLAGS="-Wall -Wno-non-template-friend -Wno-long-long -Wimplicit -Wreturn-type -Wunused -Wparentheses -Werror=array-bounds -Wno-deprecated">
161   <Flags LDFLAGS="-Wl,-E">
162   <Flags CXXSHAREDFLAGS="-Wl,-E">
163   <Flags SHAREDSUFFIX="so">
164   <Flags SCRAM_LANGUAGE_TYPE="C++">
165 < <Runtime name=GCC_EXEC_PREFIX default="$GCC_BASE/lib/gcc-lib/">
165 > # <Runtime name=GCC_EXEC_PREFIX default="$GCC_BASE/lib/gcc">
166 > # <Runtime name=LIBRARY_PATH default="$GCC_BASE/lib/gcc/i686-pc-linux-gnu/4.3.4/:$GCC_BASE/include/c++/4.3.4/">
167 > # <Runtime name=COMPILER_PATH default="$GCC_BASE/bin:$GCC_BASE/libexec/gcc/i686-pc-linux-gnu/4.3.4/">
168 > <Runtime name=PATH value="$GCC_BASE/bin" type=path>
169 > <Runtime name=GXX_ROOT value="$GCC_BASE">
170   </tool>
171   EOF_TOOLFILE
172   #ccompiler
# Line 175 | Line 174 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cco
174   <doc type=BuildSystem::ToolDoc version=1.1>
175   <tool name=ccompiler version=%compiler_version type=compiler>
176   <client>
177 < <Environment name=GCC_BASE default="/usr"></Environment>
177 > <Environment name=GCC_BASE default="/opt/gcc/slc5onl_ia32_gcc434/external/gcc/4.3.4"></Environment>
178   <Environment name=GCCBINDIR value="$GCC_BASE/bin"></Environment>
179   <Environment name=CC value="$GCCBINDIR/gcc"></Environment>
180   </client>
# Line 185 | Line 184 | cat << \EOF_TOOLFILE >%i/etc/scram.d/cco
184   <Flags CFLAGS="-O2">
185   <Flags LDFLAGS="-Wl,-E">
186   <Flags CSHAREDFLAGS="-Wl,-E">
187 < <Flags SCRAM_COMPILER_NAME="gcc345">
187 > <Flags SCRAM_COMPILER_NAME="gcc434">
188   <Flags SCRAM_LANGUAGE_TYPE="C">
189   </tool>
190   EOF_TOOLFILE
# Line 197 | Line 196 | cat << \EOF_TOOLFILE >%i/etc/scram.d/f77
196   <lib name=g2c>
197   <lib name=m>
198   <client>
199 < <Environment name=G77_BASE default="/usr"></Environment>
200 < <Environment name=FC default="$G77_BASE/bin/g77"></Environment>
199 > <Environment name=G77_BASE default="/opt/gcc/slc5onl_ia32_gcc434/external/gcc/4.3.4"></Environment>
200 > <Environment name=FC default="$G77_BASE/bin/gfortran"></Environment>
201   </client>
202 < <Flags SCRAM_COMPILER_NAME="gcc345">
202 > <Flags SCRAM_COMPILER_NAME="gcc434">
203   <Flags FFLAGS="-fno-second-underscore -Wno-globals -Wunused -Wuninitialized">
204   <Flags FCO2Flag="-O2">
205   <Flags FCOPTIMISED="-O2">
# Line 358 | Line 357 | cat << \EOF_TOOLFILE >%i/etc/scram.d/mim
357   </Tool>
358   EOF_TOOLFILE
359  
361 – %endif
362 –
360   %post
361   %{relocateConfig}etc/scram.d/sockets
362   %{relocateConfig}etc/scram.d/opengl
363   %{relocateConfig}etc/scram.d/x11
364   %{relocateConfig}etc/scram.d/jcompiler
368 –
369 – %if "%cmsplatf" == "slc4onl_ia32_gcc346"
365   %{relocateConfig}etc/scram.d/cxxcompiler
366   %{relocateConfig}etc/scram.d/ccompiler
367   %{relocateConfig}etc/scram.d/f77compiler
# Line 379 | Line 374 | EOF_TOOLFILE
374   %{relocateConfig}etc/scram.d/xdaqheader
375   %{relocateConfig}etc/scram.d/mimetic
376  
382 – %endif
383 –

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines