Merge pull request #7790 from cms-sw/drop-yaml-cpp

Dropped yaml-cpp; it is not any more required by rivet
cms-sw · Apr 14, 2022 · 9648f20 · 9648f20
2 parents 96e711c + 9412c43
commit 9648f20
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -113,7 +113,6 @@ Requires: sloccount
 Requires: millepede
 Requires: pacparser
 Requires: git
-Requires: yaml-cpp
 Requires: gmp-static
 Requires: mpfr-static
 Requires: fastjet-contrib

diff --git a/scram-tools.file/tools/lhapdf/lhapdf.xml b/scram-tools.file/tools/lhapdf/lhapdf.xml
@@ -5,7 +5,7 @@
     <environment name="LIBDIR" default="$LHAPDF_BASE/lib"/>
     <environment name="INCLUDE" default="$LHAPDF_BASE/include"/>
   </client>
-  <use name="yaml-cpp"/>
+  <use name="pythia6"/>
   <runtime name="LHAPDF_DATA_PATH" value="$LHAPDF_BASE/share/LHAPDF"/>
   <runtime name="PATH" value="$LHAPDF_BASE/bin" type="path"/>
   <runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>

diff --git a/yaml-cpp.spec b/yaml-cpp.spec