diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2023-05-10 14:52:15 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 14:52:15 +1000 |
| commit | 9dfa0dced6916003ca912e3334cefe108c076273 (patch) | |
| tree | 3d28e5d7accbf82d7365e862764750e86e60c09c /tools | |
| parent | 460c891d1e954531568f66e5dd4d6b2a9126f420 (diff) | |
| parent | a7db7ad8ad185069fa147e65e0e531d97ad2dd36 (diff) | |
Merge pull request #23239 from neo1973/gcc13
Fix build with GCC>=13
Diffstat (limited to 'tools')
5 files changed, 42 insertions, 1 deletions
diff --git a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h index 3279c55a1c..5bc06f2f96 100644 --- a/tools/depends/native/TexturePacker/src/decoder/IDecoder.h +++ b/tools/depends/native/TexturePacker/src/decoder/IDecoder.h @@ -20,6 +20,7 @@ #pragma once +#include <cstdint> #include <string> #include <vector> diff --git a/tools/depends/target/crossguid/003-add-cstdint-include.patch b/tools/depends/target/crossguid/003-add-cstdint-include.patch new file mode 100644 index 0000000000..9a710d835a --- /dev/null +++ b/tools/depends/target/crossguid/003-add-cstdint-include.patch @@ -0,0 +1,10 @@ +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -36,6 +36,7 @@ THE SOFTWARE. + #include <string_view> + #include <utility> + #include <iomanip> ++#include <cstdint> + + #define BEGIN_XG_NAMESPACE namespace xg { + #define END_XG_NAMESPACE } diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile index 2138ede9d3..da01c39e25 100644 --- a/tools/depends/target/crossguid/Makefile +++ b/tools/depends/target/crossguid/Makefile @@ -47,6 +47,7 @@ endif cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); patch -p1 -i ../001-fix-unused-function.patch cd $(PLATFORM); patch -p1 -i ../002-disable-Wall-error.patch + cd $(PLATFORM); patch -p1 -i ../003-add-cstdint-include.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. .installed-$(PLATFORM): $(PLATFORM) diff --git a/tools/depends/target/waylandpp/001-fix-gcc13-build.patch b/tools/depends/target/waylandpp/001-fix-gcc13-build.patch new file mode 100644 index 0000000000..c440c1141e --- /dev/null +++ b/tools/depends/target/waylandpp/001-fix-gcc13-build.patch @@ -0,0 +1,28 @@ +--- a/include/wayland-client.hpp ++++ b/include/wayland-client.hpp +@@ -33,6 +33,7 @@ + #include <memory> + #include <string> + #include <vector> ++#include <cstdint> + #include <wayland-version.hpp> + #include <wayland-client-core.h> + #include <wayland-util.hpp> + +--- a/scanner/scanner.cpp ++++ b/scanner/scanner.cpp +@@ -24,6 +24,7 @@ + #include <cctype> + #include <cmath> + #include <stdexcept> ++#include <cstdint> + + #include "pugixml.hpp" + +@@ -928,6 +929,7 @@ + << "#include <memory>" << std::endl + << "#include <string>" << std::endl + << "#include <vector>" << std::endl ++ << "#include <cstdint>" << std::endl + << std::endl + << "#include <wayland-client.hpp>" << std::endl; diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile index 9acdcebf32..7eedeedb9e 100644 --- a/tools/depends/target/waylandpp/Makefile +++ b/tools/depends/target/waylandpp/Makefile @@ -1,5 +1,5 @@ -include ../../Makefile.include -DEPS =Makefile ../../download-files.include +DEPS =Makefile ../../download-files.include 001-fix-gcc13-build.patch # lib name, version LIBNAME=waylandpp @@ -43,6 +43,7 @@ ifeq ($(PREFIX),) endif rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + cd $(PLATFORM); patch -p1 -i ../001-fix-gcc13-build.patch mkdir -p $(BUILDDIR) cd $(BUILDDIR); $(CMAKE) $(CMAKE_OPTIONS) .. |