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.23 by eulisse, Fri Jul 14 18:59:46 2006 UTC vs.
Revision 1.28 by eulisse, Wed Jul 26 10:21:24 2006 UTC

# Line 2 | Line 2
2   # INITENV +PATH PYTHONPATH %i/lib/python
3   Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %v | tr . -)&module=root&output=/%{n}_v%{v}.source.tar.gz
4   #Source: ftp://root.cern.ch/%n/%{n}_v%{v}.source.tar.gz
5 < Requires: gccxml python qt gsl castor openssl mysql libpng libjpg libtiff dcap pcre zlib
5 > %define cpu %(echo %cmsplatf | cut -d_ -f2)
6 > %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
7 > Requires: gccxml python qt gsl castor openssl mysql libpng libjpg dcap pcre zlib oracle
8 >
9 > %if "%cpu" != "amd64"
10 > Requires: libtiff
11 > %endif
12 >
13   Patch: root-cint-bug
14   %prep
15   %setup -n root
9 %patch -p0
16   %build
17   mkdir -p %i
18   export ROOTSYS=%_builddir/root
19 < CONFIG_ARGS="--enable-table
19 > CONFIG_ARGS="--enable-table
20               --disable-builtin-pcre
21               --disable-builtin-freetype
22               --disable-builtin-zlib
23               --with-gccxml=${GCCXML_ROOT}
24 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include
24 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
25               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
26 <             --with-dcap-libdir=${DCAP_ROOT}/lib
21 <             --with-dcap-incdir=${DCAP_ROOT}/include
26 >             --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include
27               --enable-explicitlink
28               --enable-qtgsi
29               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
# Line 34 | Line 39 | CONFIG_ARGS="--enable-table
39               --with-dcap-incdir=${DCAP_ROOT}/include
40               --with-ssl-incdir=${OPENSSL_ROOT}/include
41               --with-ssl-libdir=${OPENSSL_ROOT}/lib
42 <             --with-shift-incdir=${CASTOR_ROOT}/include
42 >             --with-shift-incdir=${CASTOR_ROOT}/include/shift
43               --with-shift-libdir=${CASTOR_ROOT}/lib
44               --disable-pgsql
45               --disable-xml"
46  
47   case $(uname)-$(uname -m) in
48    Linux-x86_64)
49 <    ./configure linuxx8664gcc $CONFIG_ARGS;;
49 >    ./configure linuxx8664gcc $CONFIG_ARGS --disable-astiff;;
50    Linux*)
51      ./configure linux $CONFIG_ARGS;;
52    Darwin*)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines