diff options
| author |   Ionen Wolkens <ionen@gentoo.org> | 2023-06-05 08:30:06 -0400 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2023-06-05 09:37:52 -0400 |
| commit | 694bb52f4d3139a846ec0713575934f3d3471fc0 (patch) | |
| tree | f4495f9e15b1af0bf937941b7e8efed419e9ee0e /dev-games | |
| parent | dev-python/pygments-2.15.1: marked ~x64-macos (diff) | |
| download | gentoo-694bb52f4d3139a846ec0713575934f3d3471fc0.tar.gz gentoo-694bb52f4d3139a846ec0713575934f3d3471fc0.tar.bz2 gentoo-694bb52f4d3139a846ec0713575934f3d3471fc0.zip | |
dev-games/godot: fix build with musl+gcc13
Not extensively checked with musl, so there could still be issues.
Closes: https://bugs.gentoo.org/906363
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-games')
| -rw-r--r-- | dev-games/godot/files/godot-3.5.2-gcc13.patch | 15 | ||||
| -rw-r--r-- | dev-games/godot/files/godot-4.0.3-gcc13.patch | 9 | ||||
| -rw-r--r-- | dev-games/godot/godot-3.5.2.ebuild | 1 | ||||
| -rw-r--r-- | dev-games/godot/godot-4.0.3.ebuild | 1 |
4 files changed, 26 insertions, 0 deletions
diff --git a/dev-games/godot/files/godot-3.5.2-gcc13.patch b/dev-games/godot/files/godot-3.5.2-gcc13.patch new file mode 100644 index 000000000000..789c78415bcd --- /dev/null +++ b/dev-games/godot/files/godot-3.5.2-gcc13.patch @@ -0,0 +1,15 @@ +Issues seem(?) to only trigger when gcc13 is combined with musl. + +https://bugs.gentoo.org/906363 +--- a/modules/fbx/fbx_parser/FBXCommon.h ++++ b/modules/fbx/fbx_parser/FBXCommon.h +@@ -78,2 +78,3 @@ + ++#include <cstdint> + #include <string> +--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h ++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h +@@ -17,2 +17,3 @@ + #define VHACD_MANIFOLD_MESH_H ++#include <cstdint> + #include "vhacdCircularList.h" diff --git a/dev-games/godot/files/godot-4.0.3-gcc13.patch b/dev-games/godot/files/godot-4.0.3-gcc13.patch new file mode 100644 index 000000000000..145303c7ebd5 --- /dev/null +++ b/dev-games/godot/files/godot-4.0.3-gcc13.patch @@ -0,0 +1,9 @@ +Issues seem(?) to only trigger when gcc13 is combined with musl. + +https://bugs.gentoo.org/906363 +--- a/thirdparty/vhacd/inc/vhacdManifoldMesh.h ++++ b/thirdparty/vhacd/inc/vhacdManifoldMesh.h +@@ -17,2 +17,3 @@ + #define VHACD_MANIFOLD_MESH_H ++#include <cstdint> + #include "vhacdCircularList.h" diff --git a/dev-games/godot/godot-3.5.2.ebuild b/dev-games/godot/godot-3.5.2.ebuild index 9ba59f48b96f..5c1c02778244 100644 --- a/dev-games/godot/godot-3.5.2.ebuild +++ b/dev-games/godot/godot-3.5.2.ebuild @@ -69,6 +69,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-3.5-musl.patch "${FILESDIR}"/${PN}-3.5-scons.patch + "${FILESDIR}"/${PN}-3.5.2-gcc13.patch ) src_prepare() { diff --git a/dev-games/godot/godot-4.0.3.ebuild b/dev-games/godot/godot-4.0.3.ebuild index c3e9af66635c..f66f4be675d0 100644 --- a/dev-games/godot/godot-4.0.3.ebuild +++ b/dev-games/godot/godot-4.0.3.ebuild @@ -72,6 +72,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.0_beta3-headless-header.patch "${FILESDIR}"/${PN}-4.0_rc2-musl.patch "${FILESDIR}"/${PN}-4.0_rc3-scons.patch + "${FILESDIR}"/${PN}-4.0.3-gcc13.patch ) src_prepare() { |