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.162 by dlange, Thu May 14 07:56:00 2009 UTC vs.
Revision 1.173 by dlange, Tue Jul 7 19:06:50 2009 UTC

# Line 3 | Line 3
3   ## INITENV SET ROOTSYS %i
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)
8  
9   Patch0:  root-5.18-00-libpng
10   Patch1:  root-5.21-04-CINT-maxlongline
# Line 26 | Line 28 | Patch18: root-5.22-00a-fireworks3
28   Patch19: root-5.22-00a-TBranchElement
29   Patch20: root-5.22-00a-tmplt
30   Patch21: root-5.22-00a-TBranchElement_TStreamerInfo
31 + Patch22: root-5.22-00a-gcc43-array-bounds-dictionary-workaround
32 + Patch23: root-5.22-00a-CINT-dict-init-speedup
33 + Patch24: root-5.22-00a-fireworks4
34  
35   %define cpu %(echo %cmsplatf | cut -d_ -f2)
36   %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
37  
38   Requires: gccxml gsl castor libjpg dcap pcre python
39  
40 < %if "%cmsplatf" != "slc4onl_ia32_gcc346"
40 > %if "%online" != "true"
41   Requires: qt openssl mysql libpng zlib libungif xrootd
42   %else
43   %define skiplibtiff true
# Line 64 | Line 69 | Requires: libtiff
69   %patch13 -p1
70   %patch14 -p0
71   %patch15 -p0
72 < %patch16 -p1
72 > # patch16 is compiler version dependent, see below
73   %patch17 -p1
74   %patch18 -p1
75   %patch19 -p0
# Line 72 | Line 77 | Requires: libtiff
77   %patch21 -p0
78   # work around patch issue...
79   rm graf3d/gl/src/gl2ps.c
80 + # patch22 is compiler version dependent, see below
81 + # patch23 is (for now) only applied for gcc4.3, see below
82 + # doesn't work at the moment %patch24 -p1
83  
84   case %gccver in
85 <  4.4)
85 >  4.3.*)
86 > %patch22 -p1
87 > %patch23 -p1
88 >  ;;
89 >  4.4.*)
90   %patch16 -p1
91    ;;
92   esac
93  
94   %build
95 +
96   mkdir -p %i
97   export ROOTSYS=%_builddir/root
98  
99 < %if "%cmsplatf" == "slc4onl_ia32_gcc346"
99 > %if "%online" == "true"
100   # Build without mysql, and use system qt.
101   # Also skip xrootd and odbc for online case:
102  
103 < EXTRA_CONFIG_ARGS="
103 > EXTRA_CONFIG_ARGS="--with-f77=/usr
104               --disable-mysql
105               --disable-xrootd
106               --disable-odbc
107 <             --enable-qt"
107 >             --disable-qt --disable-qtgsi"
108   %else
109 < EXTRA_CONFIG_ARGS="
109 > EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
110               --with-xrootd=$XROOTD_ROOT
111               --enable-mysql --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
112               --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
113               --with-ssl-incdir=${OPENSSL_ROOT}/include
114 <             --with-ssl-libdir=${OPENSSL_ROOT}/lib"
114 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib
115 >             --enable-qtgsi"
116   %endif
117  
118 < CONFIG_ARGS="--with-f77=${GCC_ROOT}
105 <             --enable-table
118 > CONFIG_ARGS="--enable-table
119               --disable-builtin-pcre
120               --disable-builtin-freetype
121               --disable-builtin-zlib
122               --with-gccxml=${GCCXML_ROOT}
123               --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
124               --enable-explicitlink
112             --enable-qtgsi
125               --enable-mathmore
126               --enable-reflex  
127               --enable-cintex
# Line 136 | Line 148 | case $(uname)-$(uname -p) in
148    Linux-i*86)
149      ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
150    Darwin*)
151 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
151 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
152    Linux-ppc64*)
153      ./configure linux $CONFIG_ARGS --disable-rfio;;
154   esac

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines