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
2 changes: 1 addition & 1 deletion abseil-cpp.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external abseil-cpp 20220623.1
### RPM external abseil-cpp 20230802.3
## INCLUDE cpp-standard

Source: https://github.com/abseil/abseil-cpp/archive/%{realversion}.tar.gz
Expand Down
10 changes: 5 additions & 5 deletions bazel-absl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
"com_google_absl": {
- "archive": "20211102.0.tar.gz",
- "sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
+ "archive": "20230125.3.tar.gz",
+ "sha256": "5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36",
+ "archive": "20230802.3.tar.gz",
+ "sha256": "052d1384266a3da0a4d16b644d7f9c4c2bfec4855720ac988a9407aebc06a3d8",
"urls": [
- "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
- "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
+ "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz",
+ "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20230802.3.tar.gz",
+ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230802.3.tar.gz",
],
"used_in": [
"additional_distfiles",
"test_WORKSPACE_files",
],
- "strip_prefix": "abseil-cpp-20211102.0",
+ "strip_prefix": "abseil-cpp-20230125.3",
+ "strip_prefix": "abseil-cpp-20230802.3",
},
"zstd-jni": {
"archive": "v1.5.0-4.zip",
7 changes: 4 additions & 3 deletions clhep.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### RPM external clhep 2.4.7.1
### RPM external clhep 2.4.7.2
## INCLUDE cpp-standard
%define tag d5f0b7af1c3231ca63887ecaa9500e1b02c6b0fe
%define tag fa41009631cf8ec83eb4f2de65af461f5818a52f
%define branch cms/v%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
Expand All @@ -19,7 +19,8 @@ cmake ../%{n}-%{realversion} \
-G Ninja \
-DCLHEP_BUILD_CXXSTD="-std=c++%{cms_cxx_standard}" \
-DCMAKE_INSTALL_PREFIX:PATH="%i" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCLHEP_BUILD_STATIC_LIBS=OFF

ninja -v %{makeprocesses}

Expand Down
2 changes: 1 addition & 1 deletion dd4hep.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### RPM external dd4hep v01-31-0x
%define tag 4990888b50e29a5dc0ff65fc3a6fdf17205192a5
%define tag 74155cec308e842fba19cc21e01165a4553bba47
%define branch master
%define github_user AIDASoft

Expand Down
11 changes: 11 additions & 0 deletions grpc-cpp23.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc.orig 2025-11-27 10:34:29.305947885 +0100
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_resolver.cc 2025-11-27 10:34:40.604302735 +0100
@@ -148,7 +148,7 @@
// to use for LRS load reporting. Caller must ensure that config_ is set
// before calling.
std::pair<absl::string_view, absl::string_view> GetLrsClusterKey() const {
- if (!parent_->is_xds_uri_) return {parent_->server_name_, nullptr};
+ if (!parent_->is_xds_uri_) return {parent_->server_name_, {}};
return {
parent_->config_->discovery_mechanisms()[index_].cluster_name,
parent_->config_->discovery_mechanisms()[index_].eds_service_name};
70 changes: 70 additions & 0 deletions grpc-no-aligned-storage.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
diff --git a/include/grpcpp/impl/codegen/server_context.h b/include/grpcpp/impl/codegen/server_context.h
index 5a62873ec8..46b797c814 100644
--- a/include/grpcpp/impl/codegen/server_context.h
+++ b/include/grpcpp/impl/codegen/server_context.h
@@ -513,8 +513,7 @@ class ServerContextBase {
const std::function<void(::grpc::Status s)> func_;
};

- typename std::aligned_storage<sizeof(Reactor), alignof(Reactor)>::type
- default_reactor_;
+ alignas(Reactor) std::byte default_reactor_[sizeof(Reactor)];
std::atomic_bool default_reactor_used_{false};
std::unique_ptr<TestServerCallbackUnary> test_unary_;
};
diff --git a/src/core/ext/filters/http/message_compress/message_compress_filter.cc b/src/core/ext/filters/http/message_compress/message_compress_filter.cc
index 09c914fab0..88d92210ef 100644
--- a/src/core/ext/filters/http/message_compress/message_compress_filter.cc
+++ b/src/core/ext/filters/http/message_compress/message_compress_filter.cc
@@ -164,9 +164,7 @@ class CallData {
grpc_linked_mdelem accept_stream_encoding_storage_;
grpc_slice_buffer slices_; /**< Buffers up input slices to be compressed */
// Allocate space for the replacement stream
- std::aligned_storage<sizeof(grpc_core::SliceBufferByteStream),
- alignof(grpc_core::SliceBufferByteStream)>::type
- replacement_stream_;
+ alignas(grpc_core::SliceBufferByteStream) std::byte replacement_stream_[sizeof(grpc_core::SliceBufferByteStream)];
grpc_closure* original_send_message_on_complete_ = nullptr;
grpc_closure send_message_on_complete_;
grpc_closure on_send_message_next_done_;
diff --git a/src/core/ext/filters/http/message_compress/message_decompress_filter.cc b/src/core/ext/filters/http/message_compress/message_decompress_filter.cc
index 4ab8a5638c..0c8dc75567 100644
--- a/src/core/ext/filters/http/message_compress/message_decompress_filter.cc
+++ b/src/core/ext/filters/http/message_compress/message_decompress_filter.cc
@@ -123,9 +123,7 @@ class CallData {
// It is initialized during construction and reset when a new stream is
// created using it.
grpc_slice_buffer recv_slices_;
- std::aligned_storage<sizeof(SliceBufferByteStream),
- alignof(SliceBufferByteStream)>::type
- recv_replacement_stream_;
+ alignas(SliceBufferByteStream) std::byte recv_replacement_stream_[sizeof(SliceBufferByteStream)];
// Fields for handling recv_trailing_metadata_ready callback
bool seen_recv_trailing_metadata_ready_ = false;
grpc_closure on_recv_trailing_metadata_ready_;
diff --git a/src/core/lib/gprpp/manual_constructor.h b/src/core/lib/gprpp/manual_constructor.h
index 7ee13796ee..2a5d40e964 100644
--- a/src/core/lib/gprpp/manual_constructor.h
+++ b/src/core/lib/gprpp/manual_constructor.h
@@ -159,10 +159,8 @@ class PolymorphicManualConstructor {
GPR_ASSERT(static_cast<BaseType*>(p) == p);
}

- typename std::aligned_storage<
- grpc_core::manual_ctor_impl::max_size_of<DerivedTypes...>::value,
- grpc_core::manual_ctor_impl::max_align_of<DerivedTypes...>::value>::type
- space_;
+ alignas(grpc_core::manual_ctor_impl::max_align_of<DerivedTypes...>::value)
+ std::byte space_[grpc_core::manual_ctor_impl::max_size_of<DerivedTypes...>::value];
};

template <typename Type>
@@ -205,7 +203,7 @@ class ManualConstructor {
void Destroy() { get()->~Type(); }

private:
- typename std::aligned_storage<sizeof(Type), alignof(Type)>::type space_;
+ alignas(Type) std::byte space_[sizeof(Type)];
};

} // namespace grpc_core
43 changes: 43 additions & 0 deletions grpc-no-std-iterator.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
diff --git a/src/core/ext/filters/client_channel/lb_policy.h b/src/core/ext/filters/client_channel/lb_policy.h
index c9fc1429ac..0b575c7d0c 100644
--- a/src/core/ext/filters/client_channel/lb_policy.h
+++ b/src/core/ext/filters/client_channel/lb_policy.h
@@ -133,25 +133,28 @@ class LoadBalancingPolicy : public InternallyRefCounted<LoadBalancingPolicy> {
/// Implemented by the client channel and used by the SubchannelPicker.
class MetadataInterface {
public:
- class iterator
- : public std::iterator<
- std::input_iterator_tag,
- std::pair<absl::string_view, absl::string_view>, // value_type
- std::ptrdiff_t, // difference_type
- std::pair<absl::string_view, absl::string_view>*, // pointer
- std::pair<absl::string_view, absl::string_view>& // reference
- > {
+ class iterator {
public:
+ using iterator_category = std::input_iterator_tag;
+ using value_type = std::pair<absl::string_view, absl::string_view>;
+ using difference_type = std::ptrdiff_t;
+ using pointer = value_type*;
+ using reference = value_type&;
+
iterator(const MetadataInterface* md, intptr_t handle)
: md_(md), handle_(handle) {}
+
iterator& operator++() {
handle_ = md_->IteratorHandleNext(handle_);
return *this;
}
- bool operator==(iterator other) const {
+
+ bool operator==(const iterator& other) const {
return md_ == other.md_ && handle_ == other.handle_;
}
- bool operator!=(iterator other) const { return !(*this == other); }
+
+ bool operator!=(const iterator& other) const { return !(*this == other); }
+
value_type operator*() const { return md_->IteratorHandleGet(handle_); }

private:
6 changes: 6 additions & 0 deletions grpc.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
Source: git+https://github.com/grpc/grpc.git?obj=master/v%{realversion}&export=%{n}-%{realversion}&submodules=1&output=/%{n}-%{realversion}.tgz
Source1: https://patch-diff.githubusercontent.com/raw/grpc/grpc/pull/28212.patch
Patch1: grpc-mno-outline-atomics
Patch2: grpc-no-aligned-storage
Patch3: grpc-no-std-iterator
Patch4: grpc-cpp23
BuildRequires: cmake ninja go
Requires: protobuf zlib pcre c-ares abseil-cpp re2
%define keep_archives true
Expand All @@ -13,6 +16,9 @@ Requires: protobuf zlib pcre c-ares abseil-cpp re2
%setup -n %{n}-%{realversion}
patch -p1 <%{_sourcedir}/28212.patch
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1

%build
rm -rf ../build
Expand Down
1 change: 1 addition & 0 deletions libfabric.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Requires: curl
Requires: numactl
Requires: rdma-core
Requires: xpmem
BuildRequires: autotools

%prep
%setup -q -n %{n}-%{realversion}
Expand Down
15 changes: 0 additions & 15 deletions tensorflow-absl-src.patch

This file was deleted.

2 changes: 1 addition & 1 deletion tensorflow-sources.file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ BuildRequires: bazel java-env git
%endif

#Set cms_cxx_standard to 17 as LLVM downloaded by TF does not build with c++20
%if "%{cms_cxx_standard}" == "20"
%if "%{cms_cxx_standard}" == "20" || "%{cms_cxx_standard}" == "23"
%undefine cms_cxx_standard
%define cms_cxx_standard 17
%endif
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-sources.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### RPM external tensorflow-sources 2.12.0
%define tag 4a22f3b460370aa5b1c60579104cd103e8f0d6bb
%define tag 655018dbd1d31b23e0c45cae82ba5a6b42254ab0
%define branch cms/v%{realversion}
%define github_user cms-externals
%define python_cmd python3
Expand Down