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.178 by elmer, Mon Sep 21 14:58:38 2009 UTC vs.
Revision 1.183 by elmer, Thu Nov 12 19:17:39 2009 UTC

# Line 4 | Line 4
4   #Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
5   Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6   %define closingbrace )
7 < %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo flase;; esac)
7 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
# Line 16 | Line 16 | Patch6: root-5.22-00a-TMVA-just-shut-the
16   Patch7: root-5.22-00a-th1
17   Patch8: root-5.22-00a-smatrix
18   Patch9: root-5.22-00a-fireworks1
19 < Patch10: root-5.22-00a-gcc44
19 > Patch10: root-5.22-00a-gcc44
20   Patch11: root-5.22-00a-fireworks2
21   Patch12: root-5.22-00a-fireworks3
22   Patch13: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
23   Patch14: root-5.22-00a-fireworks4
24   Patch15: root-5.22-00d-fireworks5
25 + Patch16: root-5.22-00d-genreflex_python26_popen3
26 + Patch17: root-5.22-00d-fireworks6
27 + Patch18: root-5.22-00d-linker-gnu-hash-style
28  
29   %define cpu %(echo %cmsplatf | cut -d_ -f2)
27 %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
30  
31   Requires: gccxml gsl castor libjpg dcap pcre python
32  
33   %if "%online" != "true"
34 < Requires: qt openssl mysql libpng zlib libungif xrootd
34 > Requires: qt openssl libpng zlib libungif xrootd
35   %else
36   %define skiplibtiff true
37   %endif
# Line 70 | Line 72 | rm graf3d/eve/src/TEveLegoOverlay.cxx
72   rm graf3d/gl/inc/gl2ps.h.orig
73   rm graf3d/gl/src/gl2ps.c.orig
74   %patch15 -p1
75 + %patch16 -p1
76 + %patch17 -p1
77  
78   case %gccver in
79    4.3.*)
# Line 79 | Line 83 | case %gccver in
83   %patch10 -p1
84    ;;
85   esac
86 +
87 + # The following patch can only be applied on SLC5 or later (extra linker
88 + # options only available with the SLC5 binutils)
89 + case %cmsplatf in
90 +  slc5_* | slc5onl_* )
91 + %patch18 -p1
92 +  ;;
93 + esac
94  
95   %build
96  
97   mkdir -p %i
98   export ROOTSYS=%_builddir/root
99 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
100  
101   %if "%online" == "true"
102 < # Build without mysql, and use system qt.
90 < # Also skip xrootd and odbc for online case:
102 > # Use system qt. Also skip xrootd and odbc for online case:
103  
104   EXTRA_CONFIG_ARGS="--with-f77=/usr
93             --disable-mysql
105               --disable-xrootd
106               --disable-odbc
107               --disable-qt --disable-qtgsi"
108   %else
109   EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
110               --with-xrootd=$XROOTD_ROOT
100             --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
111               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
112               --with-ssl-incdir=${OPENSSL_ROOT}/include
113               --with-ssl-libdir=${OPENSSL_ROOT}/lib
# Line 109 | Line 119 | CONFIG_ARGS="--enable-table
119               --disable-builtin-freetype
120               --disable-builtin-zlib
121               --with-gccxml=${GCCXML_ROOT}
122 <             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
122 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
123               --enable-explicitlink
124               --enable-mathmore
125               --enable-reflex  
# Line 122 | Line 132 | CONFIG_ARGS="--enable-table
132               --with-dcap-libdir=${DCAP_ROOT}/lib
133               --with-dcap-incdir=${DCAP_ROOT}/include
134               --disable-pgsql
135 +             --disable-mysql
136               --disable-xml ${EXTRA_CONFIG_ARGS}"
137  
138 < #case %gccver in
128 < #  4.*)
129 < #  CONFIG_ARGS="$CONFIG_ARGS --disable-cern"
130 < #  ;;
131 < #esac
132 <
133 < case $(uname)-$(uname -p) in
138 > case $(uname)-$(uname -m) in
139    Linux-x86_64)
140      ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
141    Linux-i*86)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines