diff options
| author | Markus Härer <markus.haerer@gmx.net> | 2023-05-07 19:24:12 +0200 |
|---|---|---|
| committer | Markus Härer <markus.haerer@gmx.net> | 2023-05-28 01:45:02 +0200 |
| commit | de1fc2de8f2f05c56cef3f49fdb1aa4a8a3b1646 (patch) | |
| tree | a4055313d8e9733bcb3635f1b7bd73b4a086f494 /tools | |
| parent | 69c1ee6657a8e98d08eea2bdb34fedd14bef3384 (diff) | |
[depends][waylandpp] Patch for compatibility with gcc>=13
(cherry picked from commit a7db7ad8ad185069fa147e65e0e531d97ad2dd36)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/waylandpp/001-fix-gcc13-build.patch | 28 | ||||
| -rw-r--r-- | tools/depends/target/waylandpp/Makefile | 3 |
2 files changed, 30 insertions, 1 deletions
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 45f86614e4..a11a9f51c1 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 @@ -41,6 +41,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) .. |