Merge pull request #6073 from cms-sw/jemalloc-tool-fix

remove jemalloc lib condition
cms-sw · Jul 16, 2020 · 5d7f9a2 · 5d7f9a2
2 parents 05e20e8 + cf9f26c
commit 5d7f9a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/jemalloc-debug-toolfile.spec b/jemalloc-debug-toolfile.spec
@@ -1,4 +1,4 @@
-### RPM external jemalloc-debug-toolfile 1.0
+### RPM external jemalloc-debug-toolfile 2.0
 Requires: jemalloc-debug
 
 %prep
@@ -10,9 +10,7 @@ Requires: jemalloc-debug
 mkdir -p %{i}/etc/scram.d
 cat << \EOF_TOOLFILE >%{i}/etc/scram.d/jemalloc-debug.xml
 <tool name="jemalloc-debug" version="@TOOL_VERSION@">
-  <architecture name="slc.*|fc.*|cc*">
-    <lib name="jemalloc"/>
-  </architecture>
+  <lib name="jemalloc"/>
   <client>
     <environment name="JEMALLOC_BASE" default="@TOOL_ROOT@"/>
     <environment name="LIBDIR"        default="$JEMALLOC_BASE/lib"/>

diff --git a/jemalloc-toolfile.spec b/jemalloc-toolfile.spec
@@ -1,4 +1,4 @@
-### RPM external jemalloc-toolfile 2.0
+### RPM external jemalloc-toolfile 3.0
 Requires: jemalloc 
 
 %prep
@@ -10,9 +10,7 @@ Requires: jemalloc
 mkdir -p %i/etc/scram.d
 cat << \EOF_TOOLFILE >%i/etc/scram.d/jemalloc.xml
 <tool name="jemalloc" version="@TOOL_VERSION@">
-  <architecture name="slc.*|fc.*">
-    <lib name="jemalloc"/>
-  </architecture>
+  <lib name="jemalloc"/>
   <client>
     <environment name="JEMALLOC_BASE" default="@TOOL_ROOT@"/>
     <environment name="LIBDIR"        default="$JEMALLOC_BASE/lib"/>