diff options
| author | throwaway96 <68320646+throwaway96@users.noreply.github.com> | 2023-09-26 02:31:45 -0400 |
|---|---|---|
| committer | throwaway96 <68320646+throwaway96@users.noreply.github.com> | 2023-09-26 02:56:13 -0400 |
| commit | 96b35aafd8b66e8054553972b825fa4290a90d0f (patch) | |
| tree | d8e4e5156a639b334d3384593801699897ca6d12 /tools | |
| parent | bddd6960f0588c74986c2a22d3fa6db2be182e4e (diff) | |
fix native/waylandpp-scanner build with GCC 13
As of GCC 13, <string> no longer transitively includes <cstdint>, so it
must be explicitly included.
This is just a copy of the patch for target/waylandpp.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/waylandpp-scanner/001-fix-gcc13-build.patch | 28 | ||||
| -rw-r--r-- | tools/depends/native/waylandpp-scanner/Makefile | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/tools/depends/native/waylandpp-scanner/001-fix-gcc13-build.patch b/tools/depends/native/waylandpp-scanner/001-fix-gcc13-build.patch new file mode 100644 index 0000000000..c440c1141e --- /dev/null +++ b/tools/depends/native/waylandpp-scanner/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/native/waylandpp-scanner/Makefile b/tools/depends/native/waylandpp-scanner/Makefile index 5b28efaa9e..ccfc8caa91 100644 --- a/tools/depends/native/waylandpp-scanner/Makefile +++ b/tools/depends/native/waylandpp-scanner/Makefile @@ -1,7 +1,7 @@ include ../../Makefile.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS =../../Makefile.include Makefile ../../download-files.include +DEPS =../../Makefile.include Makefile ../../download-files.include 001-fix-gcc13-build.patch # lib name, version LIBNAME=waylandpp @@ -27,6 +27,7 @@ all: .installed-$(PLATFORM) $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) 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); $(NATIVEPREFIX)/bin/cmake $(CMAKE_OPTIONS) .. |