diff options
| author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-11-20 14:14:35 +0100 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-11-26 07:50:35 -0800 |
| commit | 4af1396e46ac224b2b2e6a098c151a603f71e885 (patch) | |
| tree | cf9c22629499d6634067affb55c9065ad6573bcb /meta | |
| parent | ee521bb17cdec4e5295efc18acfdbf26d09cc683 (diff) | |
| download | poky-4af1396e46ac224b2b2e6a098c151a603f71e885.tar.gz | |
glslang: fix compiling with gcc15
Backport a patch that fixes a compilation failure with gcc15:
| .../git/SPIRV/SpvBuilder.h:238:30: error: ‘uint32_t’ has not been declared
| 238 | Id makeDebugLexicalBlock(uint32_t line);
| | ^~~~~~~~
| .../git/SPIRV/SpvBuilder.h:64:1: note: ‘uint32_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
(From OE-Core rev: cd0039c22d7aa3d6983ac6fe917b648930355849)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-graphics/glslang/glslang_1.3.275.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-graphics/glslang/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch b/meta/recipes-graphics/glslang/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch new file mode 100644 index 0000000000..02b072c56a --- /dev/null +++ b/meta/recipes-graphics/glslang/glslang/0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | From e40c14a3e007fac0e4f2e4164fdf14d1712355bd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Sergei Trofimovich <slyich@gmail.com> | ||
| 3 | Date: Fri, 2 Aug 2024 22:44:21 +0100 | ||
| 4 | Subject: [PATCH] SPIRV/SpvBuilder.h: add missing <cstdint> include | ||
| 5 | |||
| 6 | Without the change `glslang` build fails on upcoming `gcc-15` as: | ||
| 7 | |||
| 8 | In file included from /build/source/SPIRV/GlslangToSpv.cpp:45: | ||
| 9 | SPIRV/SpvBuilder.h:248:30: error: 'uint32_t' has not been declared | ||
| 10 | 248 | Id makeDebugLexicalBlock(uint32_t line); | ||
| 11 | | ^~~~~~~~ | ||
| 12 | |||
| 13 | Upstream-Status: Backport [https://github.com/KhronosGroup/glslang/commit/e40c14a3e007fac0e4f2e4164fdf14d1712355bd] | ||
| 14 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 15 | --- | ||
| 16 | SPIRV/SpvBuilder.h | 1 + | ||
| 17 | 1 file changed, 1 insertion(+) | ||
| 18 | |||
| 19 | diff --git a/SPIRV/SpvBuilder.h b/SPIRV/SpvBuilder.h | ||
| 20 | index b1ca6ce1..00b2e53a 100644 | ||
| 21 | --- a/SPIRV/SpvBuilder.h | ||
| 22 | +++ b/SPIRV/SpvBuilder.h | ||
| 23 | @@ -56,6 +56,7 @@ namespace spv { | ||
| 24 | } | ||
| 25 | |||
| 26 | #include <algorithm> | ||
| 27 | +#include <cstdint> | ||
| 28 | #include <map> | ||
| 29 | #include <memory> | ||
| 30 | #include <set> | ||
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb index 2fd1e72a26..b688b3df48 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.275.0.bb | |||
| @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" | |||
| 11 | SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a" | 11 | SRCREV = "a91631b260cba3f22858d6c6827511e636c2458a" |
| 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ |
| 13 | file://0001-generate-glslang-pkg-config.patch \ | 13 | file://0001-generate-glslang-pkg-config.patch \ |
| 14 | file://0001-SPIRV-SpvBuilder.h-add-missing-cstdint-include.patch \ | ||
| 14 | " | 15 | " |
| 15 | PE = "1" | 16 | PE = "1" |
| 16 | # These recipes need to be updated in lockstep with each other: | 17 | # These recipes need to be updated in lockstep with each other: |
