summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-12-01 16:42:16 +0000
committerSam James <sam@gentoo.org>2021-12-01 16:42:29 +0000
commit9e170d9159e96863444a8270c1cee602d8c00d6a (patch)
tree60e7f5ca4c9f5aafc2f755d0714a642985320c86 /dev-libs/libixion
parentprofiles/arch/powerpc: Mask gentoo-kernel-bin on big-endian (diff)
downloadgentoo-9e170d9159e96863444a8270c1cee602d8c00d6a.tar.gz
gentoo-9e170d9159e96863444a8270c1cee602d8c00d6a.tar.bz2
gentoo-9e170d9159e96863444a8270c1cee602d8c00d6a.zip
dev-libs/libixion: fix build with Clang
Closes: https://bugs.gentoo.org/793917 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-libs/libixion')
-rw-r--r--dev-libs/libixion/files/libixion-0.16.1-clang.patch18
-rw-r--r--dev-libs/libixion/libixion-0.16.1.ebuild4
2 files changed, 22 insertions, 0 deletions
diff --git a/dev-libs/libixion/files/libixion-0.16.1-clang.patch b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
new file mode 100644
index 000000000000..802d43e71592
--- /dev/null
+++ b/dev-libs/libixion/files/libixion-0.16.1-clang.patch
@@ -0,0 +1,18 @@
+https://gitlab.com/ixion/ixion/-/commit/1992b8ab9c7765b8da06b6054bb3c0ab990c62f7
+https://bugs.gentoo.org/793917
+
+From: Jory Pratt <anarchy@gentoo.org>
+Date: Wed, 2 Jun 2021 10:19:01 -0500
+Subject: [PATCH] Fix nullptr_t for clang/musl users
+
+--- a/src/libixion/model_context.cpp
++++ b/src/libixion/model_context.cpp
+@@ -17,7 +17,7 @@
+
+ namespace ixion {
+
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+ value.boolean = b;
diff --git a/dev-libs/libixion/libixion-0.16.1.ebuild b/dev-libs/libixion/libixion-0.16.1.ebuild
index 8d3350a54854..0f397c8828ef 100644
--- a/dev-libs/libixion/libixion-0.16.1.ebuild
+++ b/dev-libs/libixion/libixion-0.16.1.ebuild
@@ -32,6 +32,10 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${P}-clang.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}