Merge pull request cms-sw#2666 from smuzaffar/IB/CMSSW_9_0_X/gcc530

Merge pull request cms-sw#2556 from xjanssen/IB/CMSSW_8_1_X/gcc530

rivet-toolfile.spec

@@ -21,7 +21,12 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/rivet.xml
 <runtime name="PDFPATH" default="$RIVET_BASE/share" type="path"/>
 <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
 <runtime name="TEXMFHOME" value="$RIVET_BASE/share/Rivet/texmf" type="path"/>
-<use name="root_cxxdefaults"/>
+<use name="python"/>
+<use name="cython"/>
+<use name="hepmc"/>
+<use name="fastjet"/>
+<use name="gsl"/>
+<use name="yoda"/>
 </tool>
 EOF_TOOLFILE
 

rivet.spec

@@ -1,7 +1,7 @@
-### RPM external rivet 2.4.0
+### RPM external rivet 2.5.2
 Source: http://cern.ch/service-spi/external/MCGenerators/distribution/rivet/rivet-%{realversion}-src.tgz
 
-Requires: hepmc boost fastjet gsl yaml-cpp yoda
+Requires: hepmc fastjet gsl yoda
 Requires: python cython
 
 Patch0: rivet-1.4.0
@@ -35,9 +35,8 @@ do
   chmod +x $CONFIG_SUB_FILE
 done
 
-./configure --disable-silent-rules --prefix=%{i} --with-boost=${BOOST_ROOT} --with-hepmc=${HEPMC_ROOT} \
+./configure --disable-silent-rules --prefix=%{i} --with-hepmc=${HEPMC_ROOT} \
             --with-fastjet=${FASTJET_ROOT} --with-gsl=$GSL_ROOT --with-yoda=${YODA_ROOT} \
-            --with-yaml-cpp=${YAML_CPP_ROOT} \
             --disable-doxygen --disable-pdfmanual --with-pic \
             PYTHONPATH=${CYTHON_ROOT}/${PYTHON_LIB_SITE_PACKAGES} \
             CXX="$(which %cms_cxx)" CXXFLAGS="%cms_cxxflags" CPPFLAGS="-I${BOOST_ROOT}/include"

yoda-toolfile.spec

@@ -15,7 +15,9 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/yoda.xml
     <environment name="LIBDIR" default="$YODA_BASE/lib"/>
     <environment name="INCLUDE" default="$YODA_BASE/include"/>
   </client>
-  <use name="boost"/>
+  <use name="python"/>
+  <use name="cython"/>
+  <use name="root_cxxdefaults"/>
   <runtime name="PYTHONPATH" value="$YODA_BASE/lib/python@PYTHONV@/site-packages" type="path"/>
   <runtime name="PATH"       value="$YODA_BASE/bin" type="path"/>
 </tool>

yoda.spec

@@ -1,17 +1,13 @@
-### RPM external yoda 1.5.5
+### RPM external yoda 1.6.5
 
 Source: http://cern.ch/service-spi/external/MCGenerators/distribution/%{n}/%{n}-%{realversion}-src.tgz
 
-Requires: boost python cython
-
-%if "%{?cms_cxxflags:set}" != "set"
-%define cms_cxxflags -std=c++0x -O2
-%endif
+Requires: python cython root
 
 %prep
 %setup -q -n %{n}/%{realversion}
 
-./configure --prefix=%i --with-boost=${BOOST_ROOT} CXX="$(which %cms_cxx)" CXXFLAGS="%cms_cxxflags"
+./configure --prefix=%i --enable-root
 
 %build
 make all