diff options
| author | Markus Härer <markus.haerer@gmx.net> | 2023-05-06 00:26:44 +0200 |
|---|---|---|
| committer | Markus Härer <markus.haerer@gmx.net> | 2023-05-28 01:45:02 +0200 |
| commit | 69c1ee6657a8e98d08eea2bdb34fedd14bef3384 (patch) | |
| tree | 922b57c0485eaa12b71b567fa16ba4445dc746b8 | |
| parent | c85d15cce188ce60b8ddbe193faf2cd5fba85b5b (diff) | |
| download | xbmc-69c1ee6657a8e98d08eea2bdb34fedd14bef3384.tar.xz | |
[depends][crossguid] Patch for compatibility with gcc>=13
(cherry picked from commit 90a4c02ad246d507feaefb97ec7196e17a9cdaaf)
| -rw-r--r-- | cmake/modules/FindCrossGUID.cmake | 3 | ||||
| -rw-r--r-- | tools/depends/target/crossguid/003-add-cstdint-include.patch | 10 | ||||
| -rw-r--r-- | tools/depends/target/crossguid/Makefile | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake index d68948a9e0..4aceb84dfc 100644 --- a/cmake/modules/FindCrossGUID.cmake +++ b/cmake/modules/FindCrossGUID.cmake @@ -29,7 +29,8 @@ if(ENABLE_INTERNAL_CROSSGUID) endif() set(patches "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/001-fix-unused-function.patch" - "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch") + "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/002-disable-Wall-error.patch" + "${CMAKE_SOURCE_DIR}/tools/depends/target/crossguid/003-add-cstdint-include.patch") generate_patchcommand("${patches}") 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 f37050dab5..f15fcd6dff 100644 --- a/tools/depends/target/crossguid/Makefile +++ b/tools/depends/target/crossguid/Makefile @@ -45,6 +45,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) |