Merge IB/CMSSW_11_1_X/master into IB/CMSSW_11_1_X/rootmaster.

cms-sw · Mar 17, 2020 · 7174a44 · 7174a44
2 parents 5310341 + 7346093
commit 7174a44
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/cmssw-tool-conf.spec b/cmssw-tool-conf.spec
@@ -50,6 +50,7 @@ Requires: ittnotify-toolfile
 Requires: jemalloc-toolfile
 Requires: jemalloc-debug-toolfile
 Requires: jimmy-toolfile
+Requires: json-toolfile
 Requires: ktjet-toolfile
 Requires: lhapdf-toolfile
 Requires: libhepml-toolfile

diff --git a/json-toolfile.spec b/json-toolfile.spec
@@ -0,0 +1,19 @@
+### RPM external json-toolfile 1.0
+Requires: json
+
+%prep
+
+%build
+
+%install
+mkdir -p %i/etc/scram.d
+cat << \EOF_TOOLFILE > %i/etc/scram.d/json.xml
+<tool name="json" version="@TOOL_VERSION@">
+  <client>
+    <environment name="JSON_BASE" default="@TOOL_ROOT@"/>
+    <environment name="INCLUDE"   default="$JSON_BASE/include"/>
+  </client>
+</tool>
+EOF_TOOLFILE
+
+## IMPORT scram-tools-post
diff --git a/json.spec b/json.spec
@@ -0,0 +1,16 @@
+### RPM external json 3.7.3
+## NOCOMPILER
+
+Source: https://github.com/nlohmann/%{n}/releases/download/v%{realversion}/include.zip
+
+%prep
+%setup -c
+
+%build
+
+%install
+mkdir -p %{i}/include/nlohmann
+cp -a include/nlohmann/json_fwd.hpp     %{i}/include/nlohmann/
+cp -a single_include/nlohmann/json.hpp  %{i}/include/nlohmann/
+
+%post