diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-23 01:33:20 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-03-23 01:33:20 +0100 |
| commit | 5cd6c37430359b936182b26f47605e396043239c (patch) | |
| tree | a6d11b5cbcc0aac4aa6d0629e132301ba6ce70aa /dev-libs | |
| parent | profiles: Mask media-video/gtk-recordmydesktop for removal (diff) | |
| download | gentoo-5cd6c37430359b936182b26f47605e396043239c.tar.gz gentoo-5cd6c37430359b936182b26f47605e396043239c.tar.bz2 gentoo-5cd6c37430359b936182b26f47605e396043239c.zip | |
dev-libs/libixion: Fix build with musl/clang
Closes: https://bugs.gentoo.org/714018
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch | 24 | ||||
| -rw-r--r-- | dev-libs/libixion/libixion-0.15.0.ebuild | 2 |
2 files changed, 26 insertions, 0 deletions
diff --git a/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch new file mode 100644 index 000000000000..be5d2e6ecaeb --- /dev/null +++ b/dev-libs/libixion/files/libixion-0.15.0-musl-clang.patch @@ -0,0 +1,24 @@ +From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 23 Aug 2019 08:50:28 -0700 +Subject: [PATCH] Fix build with clang. + +--- + include/ixion/model_context.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp +index 6ff5b67..dc27ed0 100644 +--- a/include/ixion/model_context.hpp ++++ b/include/ixion/model_context.hpp +@@ -61,7 +61,7 @@ public: + } value; + + /** Initializes the cell to be empty. */ +- input_cell(nullptr_t); ++ input_cell(std::nullptr_t); + /** Boolean cell value. */ + input_cell(bool b); + /** The char array must be null-terminated. */ +-- +2.24.1 diff --git a/dev-libs/libixion/libixion-0.15.0.ebuild b/dev-libs/libixion/libixion-0.15.0.ebuild index 741d54be08e4..58f699f6b195 100644 --- a/dev-libs/libixion/libixion-0.15.0.ebuild +++ b/dev-libs/libixion/libixion-0.15.0.ebuild @@ -32,6 +32,8 @@ DEPEND="${RDEPEND} dev-libs/spdlog " +PATCHES=( "${FILESDIR}/${P}-musl-clang.patch" ) # bug 714018 + pkg_setup() { use python && python-single-r1_pkg_setup } |