Skip to content

Commit 58d85a7

Browse files
smuzaffarsmuzaffar
authored
Merge branch 'IB/CMSSW_16_0_X/py312' into bokeh
2 parents 6f3e204 + 859a771 commit 58d85a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+447
-517
lines changed

‎abseil-cpp.spec‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
### RPM external abseil-cpp 20220623.1
1+
### RPM external abseil-cpp 20230802.2
22
## INCLUDE cpp-standard
33

44
Source: https://github.com/abseil/abseil-cpp/archive/%{realversion}.tar.gz
5-
5+
Source2: https://patch-diff.githubusercontent.com/raw/abseil/abseil-cpp/pull/1732.diff
66
BuildRequires: cmake gmake
77

88
%prep
99
%setup -n %{n}-%{realversion}
10+
patch -p1 <%{_sourcedir}/1732.diff
1011

1112
%build
1213
rm -rf ../build

‎autotools.spec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
%define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
77
%define libtool_version 2.5.4
88
%define m4_version 1.4.19
9-
%define gettext_version 0.22
9+
%define gettext_version 0.22.5
1010
%define pkgconfig_version 0.29.2
1111
Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
1212
Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
1313
Source2: http://ftp.gnu.org/gnu/libtool/libtool-%{libtool_version}.tar.gz
1414
Source3: http://ftp.gnu.org/gnu/m4/m4-%{m4_version}.tar.gz
1515
Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{gettext_version}.tar.gz
1616
Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_version}.tar.gz
17+
BuildRequires: gmake
1718

1819
%prep
1920
%setup -D -T -b 0 -n autoconf-%{autoconf_version}

‎bazel-absl.patch‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
--- bazel/distdir_deps.bzl.orig 2023-06-12 11:36:07.650810578 +0200
2-
+++ bazel/distdir_deps.bzl 2023-06-12 11:37:10.490300045 +0200
3-
@@ -162,17 +162,17 @@
1+
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
2+
index a3cd93a..f756645 100755
3+
--- a/distdir_deps.bzl
4+
+++ b/distdir_deps.bzl
5+
@@ -229,16 +229,16 @@ DIST_DEPS = {
46
],
57
},
68
"com_google_absl": {
7-
- "archive": "20211102.0.tar.gz",
8-
- "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
9-
+ "archive": "20230125.3.tar.gz",
10-
+ "sha256": "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36",
9+
- "archive": "20230802.0.tar.gz",
10+
- "sha256": "59d2976af9d6ecf001a81a35749a6e551a335b949d34918cfade07737b9d93c5",
11+
+ "archive": "20230802.2.tar.gz",
12+
+ "sha256": "7c11539617af1f332f0854a6fb21e296a1b29c27d03f23c7b49d4adefcd102cc",
1113
"urls": [
12-
- "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
13-
- "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
14-
+ "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
15-
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
14+
- "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.0.tar.gz",
15+
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.2.tar.gz",
1616
],
1717
"used_in": [
1818
"additional_distfiles",
1919
"test_WORKSPACE_files",
2020
],
21-
- "strip_prefix": "abseil-cpp-20211102.0",
22-
+ "strip_prefix": "abseil-cpp-20230125.3",
21+
- "strip_prefix": "abseil-cpp-20230802.0",
22+
+ "strip_prefix": "abseil-cpp-20230802.2",
2323
},
2424
"zstd-jni": {
25-
"archive": "v1.5.0-4.zip",
25+
"archive": "v1.5.2-3.zip",

‎bazel-gcc14.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎bazel.spec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### RPM external bazel 5.3.0
1+
### RPM external bazel 6.5.0
22
## INCLUDE cpp-standard
33

44
Source: https://github.com/bazelbuild/bazel/releases/download/%{realversion}/bazel-%{realversion}-dist.zip
@@ -19,19 +19,17 @@ BuildRequires: java-env python3 python-python3
1919
# https://github.com/bazelbuild/bazel/issues/9392
2020
Patch0: bazel-3.7.0-patches
2121
Patch1: bazel-absl
22-
Patch2: bazel-gcc14
2322

2423
%prep
2524
%setup -q -c -n bazel-%{realversion}
2625

2726
%patch0 -p1
2827
%patch1 -p1
29-
%patch2 -p1
3028

3129
%build
3230

3331
export EXTRA_BAZEL_ARGS="--define=ABSOLUTE_JAVABASE=${JAVA_HOME} --jobs %{compiling_processes}"
34-
export BAZEL_CXXOPTS="-std=c++%{cms_cxx_standard}"
32+
export BAZEL_CXXOPTS="-Wno-error=deprecated:-std=c++%{cms_cxx_standard}"
3533
${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]'
3634
if [ $(${JAVA_HOME}/bin/java -version 2>&1 | grep -E -i 'openjdk version "[1-9]' | sed -E 's|.* "([0-9]+)[.].*|\1|') -ge 17 ] ; then
3735
export JNI_FLAGS="--add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED"

‎blackhat.patch‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
diff --git a/my_programs/Makefile.am b/my_programs/Makefile.am
2+
index 6fef244..c35abe4 100644
3+
--- a/my_programs/Makefile.am
4+
+++ b/my_programs/Makefile.am
5+
@@ -65,13 +65,13 @@ LINKER_ARGS += -lmpfr -lgmpxx -lgmp
6+
CXXFLAGS += -DBH_USE_GMP
7+
endif
8+
9+
-include $(DEPDIR)/*.Po
10+
-
11+
%.o: $(abs_srcdir)/%.cpp
12+
test -f $(DEPDIR)/$*.Po || mkdir -p .deps ; echo "#dummy" > $(DEPDIR)/$*.Po
13+
$(CXX) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(INCLUDE) -o $@ $<
14+
mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
15+
16+
+#include $(DEPDIR)/*.Po
17+
+
18+
LINKER_FLAGS=$(AM_LDFLAGS)
19+
if GMP_PATH_SET
20+
LINKER_FLAGS += -L$(AM_GMP_PATH)
21+
diff --git a/configure.ac b/configure.ac
22+
index 2099377..6396f8b 100644
23+
--- a/configure.ac
24+
+++ b/configure.ac
25+
@@ -1,7 +1,8 @@
26+
AC_INIT([BlackHat], [0.9.9], [[email protected]])
27+
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
28+
+AM_INIT_AUTOMAKE([-Wall foreign])
29+
AM_DISABLE_STATIC
30+
AC_PROG_CXX
31+
+AM_PROG_AR
32+
AC_CONFIG_MACRO_DIR([m4])
33+
AC_CONFIG_HEADERS([config.h])
34+
AC_CHECK_FUNCS([pow log sqrt])

‎blackhat.spec‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
%define github_user cms-externals
55
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
66
Requires: qd python3
7+
BuildRequires: autotools
8+
Patch0: blackhat
79

810
%prep
911
%setup -n %{n}-%{realversion}
12+
%patch0 -p1
1013

1114
sed -i -e 's|else return Cached_OLHA_user_normal|else return new Cached_OLHA_user_normal|' src/cached_OLHA.cpp
1215

@@ -17,6 +20,7 @@ rm -f ./config.{sub,guess}
1720
chmod +x ./config.{sub,guess}
1821

1922
%build
23+
autoreconf -ivf
2024
PYTHON=$(which python3) ./configure --prefix=%i \
2125
--with-QDpath=$QD_ROOT \
2226
--enable-pythoninterface=no \

‎bz2lib.spec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
### RPM external bz2lib 1.0.6
2-
Source: http://www.bzip.org/%{realversion}/bzip2-%{realversion}.tar.gz
1+
### RPM external bz2lib 1.0.8
2+
Source: https://gitlab.com/bzip2/bzip2/-/archive/bzip2-%{realversion}/bzip2-bzip2-%{realversion}.tar.gz
3+
BuildRequires: gmake
34

45
%prep
5-
%setup -n bzip2-%{realversion}
6+
%setup -n bzip2-bzip2-%{realversion}
67
sed -e 's/ -shared/ -dynamiclib/' \
78
-e 's/ -Wl,-soname -Wl,[^ ]*//' \
89
-e 's/libbz2\.so/libbz2.dylib/g' \

‎cmake.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
%define downloaddir %(echo %realversion | cut -d. -f1,2)
33
Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz
44
Requires: bz2lib curl expat zlib
5+
BuildRequires: gmake
56

67
%prep
78
%setup -n cmake-%realversion

‎cmsswdata.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Source: none
55
%define BaseTool %(echo %n | tr '[a-z-]' '[A-Z_]')
66

77
Requires: data-CondTools-SiPhase2Tracker
8+
Requires: data-PhysicsTools-PyTorch
89
Requires: data-PhysicsTools-PyTorchAlpaka
910
Requires: data-PhysicsTools-PyTorchAlpakaTest
1011
Requires: data-RecoLocalCalo-HGCalRecProducers

0 commit comments

Comments
 (0)