diff options
| author | Andreas Baumbach <healther@users.noreply.github.com> | 2020-10-09 18:17:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 11:17:11 -0500 |
| commit | 830b30b8d54ad209667115e8ed45d159f82824c1 (patch) | |
| tree | 9364544dfddd7a8feac0231bf372cd69cb36bf8e /var | |
| parent | 796561ed822d64be6fd2ef299093711a8534d0e9 (diff) | |
| download | spack-830b30b8d54ad209667115e8ed45d159f82824c1.tar.gz spack-830b30b8d54ad209667115e8ed45d159f82824c1.tar.bz2 spack-830b30b8d54ad209667115e8ed45d159f82824c1.tar.xz spack-830b30b8d54ad209667115e8ed45d159f82824c1.zip | |
Patch cereal (#19091)
Change-Id: I9fe2a1490c8c31a4174aca4ed2e270aa1efa1a50
Co-authored-by: Eric Müller <mueller@kip.uni-heidelberg.de>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/cereal/LockGuard-default-ctor.patch | 13 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/cereal/package.py | 2 |
2 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/cereal/LockGuard-default-ctor.patch b/var/spack/repos/builtin/packages/cereal/LockGuard-default-ctor.patch new file mode 100644 index 0000000000..e0aba786ce --- /dev/null +++ b/var/spack/repos/builtin/packages/cereal/LockGuard-default-ctor.patch @@ -0,0 +1,13 @@ +diff -pur cereal/include/cereal/details/static_object.hpp cereal_new/include/cereal/details/static_object.hpp +--- cereal/include/cereal/details/static_object.hpp 2020-05-06 11:10:09.251770253 +0200 ++++ cereal_new/include/cereal/details/static_object.hpp 2020-05-06 11:11:00.904447455 +0200 +@@ -94,7 +94,8 @@ namespace cereal + std::unique_lock<std::mutex> lock; + #else + public: +- LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning ++ LockGuard() = default; ++ LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning + ~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used + #endif + }; diff --git a/var/spack/repos/builtin/packages/cereal/package.py b/var/spack/repos/builtin/packages/cereal/package.py index 51503b2fbe..c35892538d 100644 --- a/var/spack/repos/builtin/packages/cereal/package.py +++ b/var/spack/repos/builtin/packages/cereal/package.py @@ -31,6 +31,8 @@ class Cereal(CMakePackage): patch("Boost.patch") patch("Boost2.patch", when="@1.2.2:") patch("pointers.patch") + # fixed in HEAD but not released yet + patch("LockGuard-default-ctor.patch", when="@:1.3.999") depends_on('cmake@2.6.2:', type='build') |