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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.107 by dlange, Sat Mar 8 02:24:13 2008 UTC vs.
Revision 1.119 by ratnik, Mon Jun 23 19:27:22 2008 UTC

# Line 9 | Line 9 | Patch1: root-5.18-00a-CINT-maxlongline
9   Patch2: root_5.18-00-CINTFunctional
10   Patch3: root-5.18-00a-TBufferXML
11   Patch4: root-5.18-00a-Cintex
12 <
12 > Patch5: root-5.18-00a-Cintex2
13 > Patch6: root-5.18-00a-TBufferFile
14 > Patch7: root-5.18-00a-cintexquickfix2
15 > Patch8: root-5.18-00a-gendict-performance
16  
17   %define cpu %(echo %cmsplatf | cut -d_ -f2)
18   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
19  
20   Requires: gccxml gsl castor libjpg dcap pcre python
21  
22 < %if "%{?online_release:set}" != "set"
23 < Requires: qt openssl mysql libpng zlib oracle libungif xrootd
22 > %if "%cmsplatf" != "slc4onl_ia32_gcc346"
23 > Requires: qt openssl mysql libpng zlib libungif xrootd
24   %else
25   %define skiplibtiff true
26   %endif
# Line 37 | Line 40 | Requires: libtiff
40   %patch2 -p0
41   %patch3 -p1
42   %patch4 -p0
43 + %patch5 -p0
44 + %patch6 -p0
45 + %patch7 -p0
46 + %patch8 -p1
47  
48   %build
49   mkdir -p %i
50   export ROOTSYS=%_builddir/root
51  
52 < %if "%{?online_release:set}" == "set"
53 < # Use oracle from xdaq installation:
54 < ORACLE_ROOT="/opt/xdaq"
55 < # Build without mysql, and use system qt and openssl:
52 > %if "%cmsplatf" == "slc4onl_ia32_gcc346"
53 > # Build without mysql, and use system qt.
54 > # Also skip xrootd and odbc for online case:
55 >
56   EXTRA_CONFIG_ARGS="
57 <             --disable-mysql
58 <             --enable-qt
59 <             --enable-ssl"
60 < # Also skip xrootd option for online case.
57 >             --disable-mysql
58 >             --disable-xrootd
59 >             --disable-odbc
60 >             --enable-qt"
61   %else
62   EXTRA_CONFIG_ARGS="
63               --with-xrootd=$XROOTD_ROOT
# Line 89 | Line 96 | CONFIG_ARGS="--enable-table
96  
97   case $(uname)-$(uname -p) in
98    Linux-x86_64)
99 <    ./configure linuxx8664gcc $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
99 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
100    Linux-i*86)
101 <    ./configure linux  $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
101 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
102    Darwin*)
103      ./configure macosx $CONFIG_ARGS --disable-rfio;;
104    Linux-ppc64*)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines