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.

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

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

Merged
merged 5 commits into from
Nov 21, 2024
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
10 changes: 9 additions & 1 deletion recipes/rxcpp/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.files import copy, get
from conan.tools.layout import basic_layout
from conan.tools.scm import Version
import os

required_conan_version = ">=1.50.0"
required_conan_version = ">=2.1"


class RxcppConan(ConanFile):
Expand All @@ -14,13 +16,19 @@ class RxcppConan(ConanFile):
homepage = "https://github.com/ReactiveX/RxCpp"
url = "https://github.com/conan-io/conan-center-index"
settings = "os", "arch", "compiler", "build_type"
package_type = "header-library"
no_copy_source = True

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

def layout(self):
basic_layout(self, src_folder="src")

def validate_build(self):
if self.settings.compiler == "gcc" and Version(self.settings.compiler.version) >= "14":
raise ConanInvalidConfiguration("This package can't be built for gcc >= 14. "
"You can compile it with a lower version and consume it later with your compiler.")

def source(self):
get(self, **self.conan_data["sources"][self.version],
Expand Down
11 changes: 0 additions & 11 deletions recipes/rxcpp/all/test_v1_package/CMakeLists.txt

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/rxcpp/all/test_v1_package/conanfile.py

This file was deleted.