Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[rxcpp/4.1.1] Add patches required for building on gcc 14 #25886

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Open

[rxcpp/4.1.1] Add patches required for building on gcc 14 #25886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions recipes/rxcpp/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ sources:
"4.1.0":
url: "https://github.com/ReactiveX/RxCpp/archive/4.1.0.tar.gz"
sha256: "d3bb49c7ac6b5c43235df710510fce87d827bb88a1b78242017f190d2acbbdea"
patches:
"4.1.1":
- patch_file: "patches/0001-gcc-14.patch"
6 changes: 5 additions & 1 deletion recipes/rxcpp/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from conan import ConanFile
from conan.tools.files import copy, get
from conan.tools.files import copy, get, apply_conandata_patches, export_conandata_patches
from conan.tools.layout import basic_layout
import os

Expand All @@ -16,6 +16,9 @@ class RxcppConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
no_copy_source = True

def export_sources(self):
export_conandata_patches(self)

def package_id(self):
self.info.clear()

Expand All @@ -27,6 +30,7 @@ def source(self):
destination=self.source_folder, strip_root=True)

def build(self):
apply_conandata_patches(self)
pass

def package(self):
Expand Down
14 changes: 14 additions & 0 deletions recipes/rxcpp/all/patches/0001-gcc-14.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/Rx/v2/src/rxcpp/rx-notification.hpp b/Rx/v2/src/rxcpp/rx-notification.hpp
index 330ddb924..6a24f0236 100644
--- a/Rx/v2/src/rxcpp/rx-notification.hpp
+++ b/Rx/v2/src/rxcpp/rx-notification.hpp
@@ -150,7 +150,7 @@
}
on_error_notification(const on_error_notification& o) : ep(o.ep) {}
on_error_notification(const on_error_notification&& o) : ep(std::move(o.ep)) {}
- on_error_notification& operator=(on_error_notification o) { ep = std::move(o.ep); return *this; }
+ on_error_notification& operator=(on_error_notification o) RXCPP_DELETE;
virtual void out(std::ostream& os) const {
os << "on_error(";
os << rxu::what(ep);