diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-10-18 17:40:05 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-10-18 23:06:34 -0700 |
| commit | 37f33b88008be021e7fc0b9d47c7e913ac77691f (patch) | |
| tree | 3530dc60c6dc7b0dc46029ef6efdcd12dafdcb69 /libs/libyaml-cpp | |
| parent | f2d67dc48ab457846646b2705a53ffff77bb569b (diff) | |
libyaml-cpp: fix compilation with libcxx
Added GitHub patch.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'libs/libyaml-cpp')
| -rw-r--r-- | libs/libyaml-cpp/Makefile | 2 | ||||
| -rw-r--r-- | libs/libyaml-cpp/patches/010-libcxx.patch | 23 |
2 files changed, 24 insertions, 1 deletions
diff --git a/libs/libyaml-cpp/Makefile b/libs/libyaml-cpp/Makefile index 2355b0a12..b78a2dd27 100644 --- a/libs/libyaml-cpp/Makefile +++ b/libs/libyaml-cpp/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libyaml-cpp PKG_VERSION:=0.6.3 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=yaml-cpp-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-$(PKG_VERSION)? diff --git a/libs/libyaml-cpp/patches/010-libcxx.patch b/libs/libyaml-cpp/patches/010-libcxx.patch new file mode 100644 index 000000000..c908b1d84 --- /dev/null +++ b/libs/libyaml-cpp/patches/010-libcxx.patch @@ -0,0 +1,23 @@ +From 78f338e4ee69bb00fb37faf50f448eeedc8b824c Mon Sep 17 00:00:00 2001 +From: Mark Jan van Kampen <mjvk@allseas.com> +Date: Tue, 13 Oct 2020 11:19:57 +0200 +Subject: [PATCH] Adds assert to enable compilation with libcxx+gcc + +Somehow this instantiates a template properly otherwise the build fails +--- + include/yaml-cpp/node/iterator.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/yaml-cpp/node/iterator.h b/include/yaml-cpp/node/iterator.h +index b4472381..080ec76c 100644 +--- a/include/yaml-cpp/node/iterator.h ++++ b/include/yaml-cpp/node/iterator.h +@@ -15,6 +15,8 @@ + #include <utility> + #include <vector> + ++static_assert(std::is_constructible<YAML::Node, const YAML::Node&>::value, "Node must be copy constructable"); ++ + namespace YAML { + namespace detail { + struct iterator_value : public Node, std::pair<Node, Node> { |