Merge IB/CMSSW_12_1_X/master into IB/CMSSW_12_1_X/gcc11.

cms-sw · Oct 25, 2021 · 5a3fb7e · 5a3fb7e
2 parents 5b09656 + e6e083a
commit 5a3fb7e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 51 deletions.
diff --git a/bootstrap-bundle.spec b/bootstrap-bundle.spec
@@ -34,7 +34,7 @@ rm -f %{i}/bin/xml2-config %{i}/lib/xml2Conf.sh
 %ifos darwin
 cp -P $GCC_ROOT/lib/lib{stdc++,gcc_s}*.%{soname} %{i}/lib
 %else
-cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s}.%{soname}* %{i}/lib
+cp -P $GCC_ROOT/%{libdir}/lib{stdc++,gcc_s,gomp}.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf.%{soname}* %{i}/lib
 cp -P $GCC_ROOT/lib/libelf-*.%{soname} %{i}/lib
 cp -P $GCC_ROOT/lib/libdw.%{soname}* %{i}/lib

diff --git a/data-cmssw-package-build.file b/data-cmssw-package-build.file
diff --git a/data/cmsswdata.txt b/data/cmsswdata.txt
@@ -57,6 +57,7 @@ SimTransport-TotemRPProtonTransportParametrization=V00-01-00
 SimG4CMS-HGCalTestBeam=V01-00-00
 Fireworks-Geometry=V07-06-00
 SimG4CMS-Forward=V02-04-00
+GeneratorInterface-ReggeGribovPartonMCInterface=V00-00-02
 
 #Never update any package here. Always move it to default section.
 [cmssw-xmldata-build]
@@ -99,15 +100,11 @@ RecoHI-HiJetAlgos=V01-00-01
 RecoParticleFlow-PFTracking=V13-01-00
 SimTransport-HectorProducer=V01-00-01
 
-#Never update any package here. Always move it to default section.
-[data-cmssw-package-build]
-GeneratorInterface-ReggeGribovPartonMCInterface=V00-00-02
-
 #Never update any package here. Always move it to default section.
 [data-package-build]
 CalibCalorimetry-CaloMiscalibTools=V01-00-00
 FastSimulation-MaterialEffects=V05-00-00
 L1Trigger-RPCTrigger=V00-15-00
 RecoParticleFlow-PFBlockProducer=V02-04-02
 SimG4CMS-Calo=V03-04-00
-Validation-Geometry=V00-07-00
+Validation-Geometry=V00-07-00
diff --git a/tensorflow-sources.file b/tensorflow-sources.file
@@ -35,8 +35,7 @@ BAZEL_OPTS="--batch --output_user_root ../build build -s --verbose_failures --di
 BAZEL_OPTS="$BAZEL_OPTS --copt=%{vectorize_flag}"
 %else
 %ifarch ppc64le
-BAZEL_OPTS="$BAZEL_OPTS --copt=-mcpu=native --copt=-mtune=native"
-BAZEL_OPTS="$BAZEL_OPTS --copt=--param=l1-cache-size=64 --copt=--param=l1-cache-line-size=128 --copt=--param=l2-cache-size=512"
+BAZEL_OPTS="$BAZEL_OPTS $(echo %{ppc64le_build_flags} | tr ' ' '\n' | grep -v '^$' | sed -e 's|^|--copt=|' | tr '\n' ' ')"
 %else
 BAZEL_OPTS="$BAZEL_OPTS --copt=-mcpu=native --copt=-mtune=native"
 %endif