forked from XRPLF/rippled
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Fix NuDB build error via Conan patch (XRPLF#5061)
* Includes updated instructions in BUILD.md.
- Loading branch information
Showing
4 changed files
with
123 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
sources: | ||
"2.0.8": | ||
url: "https://github.com/CPPAlliance/NuDB/archive/2.0.8.tar.gz" | ||
sha256: "9b71903d8ba111cd893ab064b9a8b6ac4124ed8bd6b4f67250205bc43c7f13a8" | ||
patches: | ||
"2.0.8": | ||
- patch_file: "patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch" | ||
patch_description: "Fix build for MSVC by including stdexcept" | ||
patch_type: "portability" | ||
patch_source: "https://github.com/cppalliance/NuDB/pull/100/files" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
import os | ||
|
||
from conan import ConanFile | ||
from conan.tools.build import check_min_cppstd | ||
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get | ||
from conan.tools.layout import basic_layout | ||
|
||
required_conan_version = ">=1.52.0" | ||
|
||
|
||
class NudbConan(ConanFile): | ||
name = "nudb" | ||
description = "A fast key/value insert-only database for SSD drives in C++11" | ||
license = "BSL-1.0" | ||
url = "https://github.com/conan-io/conan-center-index" | ||
homepage = "https://github.com/CPPAlliance/NuDB" | ||
topics = ("header-only", "KVS", "insert-only") | ||
|
||
package_type = "header-library" | ||
settings = "os", "arch", "compiler", "build_type" | ||
no_copy_source = True | ||
|
||
@property | ||
def _min_cppstd(self): | ||
return 11 | ||
|
||
def export_sources(self): | ||
export_conandata_patches(self) | ||
|
||
def layout(self): | ||
basic_layout(self, src_folder="src") | ||
|
||
def requirements(self): | ||
self.requires("boost/1.83.0") | ||
|
||
def package_id(self): | ||
self.info.clear() | ||
|
||
def validate(self): | ||
if self.settings.compiler.cppstd: | ||
check_min_cppstd(self, self._min_cppstd) | ||
|
||
def source(self): | ||
get(self, **self.conan_data["sources"][self.version], strip_root=True) | ||
|
||
def build(self): | ||
apply_conandata_patches(self) | ||
|
||
def package(self): | ||
copy(self, "LICENSE*", | ||
dst=os.path.join(self.package_folder, "licenses"), | ||
src=self.source_folder) | ||
copy(self, "*", | ||
dst=os.path.join(self.package_folder, "include"), | ||
src=os.path.join(self.source_folder, "include")) | ||
|
||
def package_info(self): | ||
self.cpp_info.bindirs = [] | ||
self.cpp_info.libdirs = [] | ||
|
||
self.cpp_info.set_property("cmake_target_name", "NuDB") | ||
self.cpp_info.set_property("cmake_target_aliases", ["NuDB::nudb"]) | ||
self.cpp_info.set_property("cmake_find_mode", "both") | ||
|
||
self.cpp_info.components["core"].set_property("cmake_target_name", "nudb") | ||
self.cpp_info.components["core"].names["cmake_find_package"] = "nudb" | ||
self.cpp_info.components["core"].names["cmake_find_package_multi"] = "nudb" | ||
self.cpp_info.components["core"].requires = ["boost::thread", "boost::system"] | ||
|
||
# TODO: to remove in conan v2 once cmake_find_package_* generators removed | ||
self.cpp_info.names["cmake_find_package"] = "NuDB" | ||
self.cpp_info.names["cmake_find_package_multi"] = "NuDB" |
24 changes: 24 additions & 0 deletions
24
external/nudb/patches/2.0.8-0001-add-include-stdexcept-for-msvc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
diff --git a/include/nudb/detail/stream.hpp b/include/nudb/detail/stream.hpp | ||
index 6c07bf1..e0ce8ed 100644 | ||
--- a/include/nudb/detail/stream.hpp | ||
+++ b/include/nudb/detail/stream.hpp | ||
@@ -14,6 +14,7 @@ | ||
#include <cstdint> | ||
#include <cstring> | ||
#include <memory> | ||
+#include <stdexcept> | ||
|
||
namespace nudb { | ||
namespace detail { | ||
diff --git a/include/nudb/impl/context.ipp b/include/nudb/impl/context.ipp | ||
index beb7058..ffde0b3 100644 | ||
--- a/include/nudb/impl/context.ipp | ||
+++ b/include/nudb/impl/context.ipp | ||
@@ -9,6 +9,7 @@ | ||
#define NUDB_IMPL_CONTEXT_IPP | ||
|
||
#include <nudb/detail/store_base.hpp> | ||
+#include <stdexcept> | ||
|
||
namespace nudb { | ||
|