Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions autotools.spec
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
### RPM external autotools 1.5
## INITENV SET M4 %{i}/bin/m4
# We keep all of them together to simplify the "requires" statements.
%define autoconf_version 2.71
%define automake_version 1.16.3
%define autoconf_version 2.72
%define automake_version 1.16.5
%define automake_maj %(echo %{automake_version} | cut -f1,2 -d.)
%define libtool_version 2.4.6
%define libtool_version 2.5.4
%define m4_version 1.4.19
%define gettext_version 0.21
%define gettext_version 0.22
%define pkgconfig_version 0.29.2
Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
Source1: http://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
Expand Down
12 changes: 12 additions & 0 deletions bazel-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/third_party/zlib/BUILD b/third_party/zlib/BUILD
index f1aa936..7317aff 100755
--- a/third_party/zlib/BUILD
+++ b/third_party/zlib/BUILD
@@ -29,6 +29,7 @@ distrib_cc_library(
# Use -Dverbose=-1 to turn off zlib's trace logging. (#3280)
copts = [
"-w",
+ "-Wno-error=implicit-function-declaration",
"-Dverbose=-1",
],
includes = ["."],
2 changes: 2 additions & 0 deletions bazel.spec
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ BuildRequires: java-env python3 python-python3
# https://github.com/bazelbuild/bazel/issues/9392
Patch0: bazel-3.7.0-patches
Patch1: bazel-absl
Patch2: bazel-gcc14

%prep
%setup -q -c -n bazel-%{realversion}

%patch0 -p1
%patch1 -p1
%patch2 -p1

%build

Expand Down
4 changes: 2 additions & 2 deletions bootstrap-driver.spec
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ platformSeeds+=" perl perl-libs"
platformSeeds+=" libbrotli python3"
platformSeeds+=" perl-base perl-lib perl-filetest perl-overload perl-vars"
%endif

#Various packages required by xrootd with krb5 enabled
platformSeeds+=" libcom_err krb5-libs"

Expand All @@ -53,7 +53,7 @@ platformBuildSeeds+=" brotli-devel"

#Various packages required by xrootd with krb5 enabled
platformBuildSeeds+=" libcom_err-devel krb5-devel"

#needed by python build
platformBuildSeeds+=" readline-devel ncurses-devel tcl-devel tk-devel"

Expand Down
2 changes: 2 additions & 0 deletions celeritas.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
%define celeritas_gitversion %(echo %{realversion} | sed -e 's|^v||;s|-.*||')
%define tag f9b51d72fc268bf22c5560b82d3dd3d7613a8106
Source: git+https://github.com/celeritas-project/celeritas?obj=develop/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Source1: https://patch-diff.githubusercontent.com/raw/celeritas-project/celeritas/pull/1110.diff

%define package_build_flags -Wall -Wextra -pedantic
## INCLUDE geant4-deps
Requires: python3 json geant4

%prep
%setup -n %{n}-%{realversion}
patch -p1 <%{_sourcedir}/1110.diff

%build

Expand Down
27 changes: 27 additions & 0 deletions clue-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
diff --git a/clueLib/include/TilesAlpaka.h b/clueLib/include/TilesAlpaka.h
index b6ba9e50006616adcb2fee8642420a14fc698aba..0e7bcfd15f867a04c9e25e3534cfc199a01ece94 100644
--- a/clueLib/include/TilesAlpaka.h
+++ b/clueLib/include/TilesAlpaka.h
@@ -30,13 +30,20 @@ class TilesAlpaka {

ALPAKA_FN_HOST_ACC int getDim1Bin(float x) const {
int dim1Bin = (x - T::minDim1) * T::invDim1BinSize;
- dim1Bin = std::clamp(dim1Bin, 0, T::nColumns - 1);
+ // Equivalent of std::clamp(dim1Bin, 0, T::nColumns - 1);
+ // which doesn't compile with gcc14 due to reference to __glibcxx_assert
+ // See https://github.com/llvm/llvm-project/issues/95183
+ // and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115740
+ int new_max = std::max(dim1Bin, 0);
+ dim1Bin = std::min(T::nColumns - 1, new_max);
return dim1Bin;
}

ALPAKA_FN_HOST_ACC int getDim2Bin(float y) const {
int dim2Bin = (y - T::minDim2) * T::invDim2BinSize;
- dim2Bin = std::clamp(dim2Bin, 0, T::nRows - 1);
+ // See comment in getDim1Bin
+ int new_max = std::max(dim2Bin, 0);
+ dim2Bin = std::min(T::nRows - 1, new_max);
return dim2Bin;
}

2 changes: 2 additions & 0 deletions clue.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
%define git_commit V_%(echo %{realversion} | tr '.' '_')

Source: https://gitlab.cern.ch/kalos/%{n}/-/archive/%{git_commit}/%{n}-%{git_commit}.tar.gz
Patch0: clue-gcc14
Requires: alpaka

%prep
%setup -n %{n}-%{git_commit}
%patch0 -p1

%build

Expand Down
2 changes: 1 addition & 1 deletion cmake.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external cmake 3.28.3
### RPM external cmake 3.31.7
%define downloaddir %(echo %realversion | cut -d. -f1,2)
Source: http://www.cmake.org/files/v%{downloaddir}/%n-%realversion.tar.gz
Requires: bz2lib curl expat zlib
Expand Down
22 changes: 22 additions & 0 deletions correctionlib-gcc14.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff --git a/rapidjson/include/rapidjson/document.h b/rapidjson/include/rapidjson/document.h
index e3e20dfbd..19f5a6a5f 100644
--- a/rapidjson/include/rapidjson/document.h
+++ b/rapidjson/include/rapidjson/document.h
@@ -316,8 +316,6 @@ struct GenericStringRef {

GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}

- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
-
//! implicit conversion to plain CharType pointer
operator const Ch *() const { return s; }

@@ -328,6 +326,8 @@ struct GenericStringRef {
//! Disallow construction from non-const array
template<SizeType N>
GenericStringRef(CharType (&str)[N]) /* = delete */;
+ //! Copy assignment operator not permitted - immutable type
+ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
};

//! Mark a character pointer as constant string
10 changes: 8 additions & 2 deletions curl.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
### RPM external curl 7.79.0
Source: http://curl.haxx.se/download/%{n}-%{realversion}.tar.gz
%if 0%{?rhel} > 9
%define curl_version 8.13.0
%else
%define curl_version 7.79.0
%endif
### RPM external curl %{curl_version}
Source: https://curl.se/download/%{n}-%{realversion}.tar.gz
Requires: zlib

%prep
Expand All @@ -23,6 +28,7 @@ Requires: zlib
--without-nss \
--without-libssh2 \
--with-gssapi=${KERBEROS_ROOT} \
--without-libpsl \
--with-openssl

make %{makeprocesses}
Expand Down
2 changes: 1 addition & 1 deletion davix.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external davix 0.8.7
### RPM external davix 0.8.9

%define tag %(echo R_%{realversion} | tr . _)
%define branch master
Expand Down
7 changes: 2 additions & 5 deletions dcap.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
### RPM external dcap 2.47.12
%define tag 5753eec777a47908a40de670094903ce6b13176b
%define branch cms/%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
### RPM external dcap 2.47.14
Source: https://github.com/dCache/dcap/archive/refs/tags/%{realversion}.tar.gz

BuildRequires: autotools
Requires: zlib
Expand Down
3 changes: 2 additions & 1 deletion fakesystem.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### RPM cms fakesystem 1.0
## REVISION 1016
## REVISION 1017
## NOCOMPILER
## NO_VERSION_SUFFIX

Expand Down Expand Up @@ -50,6 +50,7 @@ Provides: perl(Tk::DialogBox)
Provides: perl(Tk::ROText)
Provides: perl(constant)
Provides: perl(full)
Provides: perl(bigint)

#################################
# Needed by git on SLC7
Expand Down
2 changes: 1 addition & 1 deletion file-bootstrap.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external file-bootstrap 5.33
### RPM external file-bootstrap 5.46
%define file_tag %(echo FILE%{realversion} | tr . _)
AutoReqProv: no
Source: https://github.com/file/file/archive/%{file_tag}.tar.gz
Expand Down
2 changes: 2 additions & 0 deletions flatbuffers.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
%define branch master
%define github_user google
Source: git+https://github.com/%{github_user}/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
Source1: https://patch-diff.githubusercontent.com/raw/google/flatbuffers/pull/7227.diff
Patch0: flatbuffers-7422

BuildRequires: cmake gmake

%prep
%setup -n %{n}-%{realversion}
%patch0 -p1
patch -p1 <%{_sourcedir}/7227.diff

%build
rm -rf ../build
Expand Down
1 change: 1 addition & 0 deletions flex.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ BuildRequires: autotools bison
%patch1 -p1

%build
CFLAGS="-O2 -Wno-error=implicit-function-declaration -Wno-error=int-conversion" \
./configure --disable-dependency-tracking --disable-nls \
--build=%{_build} --host="%{_host}" --prefix=%{i}
make %{makeprocesses}
Expand Down
Loading