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.235 by fwyzard, Fri Jan 21 12:31:46 2011 UTC vs.
Revision 1.236 by eulisse, Mon Jan 24 16:50:58 2011 UTC

# Line 122 | Line 122 | CONFIG_ARGS="--enable-table
122               --disable-oracle
123               --disable-xml ${EXTRA_CONFIG_ARGS}"
124  
125 < case $(uname)-$(uname -m) in
126 <  Linux-x86_64)
125 > case %cmsos in
126 >  slc*_amd64)
127      ./configure linuxx8664gcc $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
128 <  Linux-i*86)
128 >  slc*_ia32)
129      ./configure linux  $CONFIG_ARGS --with-rfio-libdir=${CASTOR_ROOT}/lib --with-rfio-incdir=${CASTOR_ROOT}/include/shift --with-castor-libdir=${CASTOR_ROOT}/lib --with-castor-incdir=${CASTOR_ROOT}/include/shift ;;
130 <  Darwin*)
130 >  osx*)
131      case %cmsplatf in
132      *_ia32_* )
133        comparch=i386
# Line 142 | Line 142 | case $(uname)-$(uname -m) in
142        macconfig=macosx
143        ;;
144      esac
145 <    export CC="gcc -arch $comparch" CXX="g++ -arch $comparch"
146 <    ./configure $macconfig $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
147 <  Linux-ppc64*)
145 >    export CC=`which gcc` CXX=`which g++`
146 >    ./configure $arch $CONFIG_ARGS --with-cc="$CC" --with-cxx="$CXX" --disable-rfio --disable-builtin_afterimage ;;
147 >  slc*_ppc64*)
148      ./configure linux $CONFIG_ARGS --disable-rfio;;
149   esac
150  
# Line 156 | Line 156 | case %cmsplatf in
156     makeopts="%makeprocesses"
157    ;;
158   esac
159 <
160 < make $makeopts
159 >
160 > make $makeopts
161   make cintdlls
162  
163   %install
# Line 176 | Line 176 | export ROOTSYS=%i
176   make INSTALL="$cp" INSTALLDATA="$cp" install
177   mkdir -p $ROOTSYS/lib/python
178   cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
179 + # This file confuses rpm's find-requires because it starts with
180 + # a """ and it thinks is the shebang.
181 + rm -f %i/tutorials/pyroot/mrt.py
182  
183   # SCRAM ToolBox toolfile
184   mkdir -p %i/etc/scram.d

Diff Legend

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