diff options
| author | Philipp Kerling <yol@casix.org> | 2024-03-30 07:17:15 +0100 |
|---|---|---|
| committer | Philipp Kerling <yol@casix.org> | 2024-06-13 20:28:07 +0200 |
| commit | 9c347e7cdbea81e271c9ce80fdc9987c69cb5019 (patch) | |
| tree | 2fee5b89a8b191f57cf4c5fd59e53612c6257fc5 /tools | |
| parent | f1b7e63a917ddc577a0252f4176323252659a290 (diff) | |
[depends] Incorporate p8-platform PR #46
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/p8-platform/004-all-fix-cxx-standard.patch | 27 | ||||
| -rw-r--r-- | tools/depends/target/p8-platform/Makefile | 4 |
2 files changed, 30 insertions, 1 deletions
diff --git a/tools/depends/target/p8-platform/004-all-fix-cxx-standard.patch b/tools/depends/target/p8-platform/004-all-fix-cxx-standard.patch new file mode 100644 index 0000000000..0055d713f0 --- /dev/null +++ b/tools/depends/target/p8-platform/004-all-fix-cxx-standard.patch @@ -0,0 +1,27 @@ +From ad9fcceb6267e737316b616551b7aac3cf676481 Mon Sep 17 00:00:00 2001 +From: Lukas Rusak <lorusak@gmail.com> +Date: Fri, 2 Oct 2020 15:31:36 -0700 +Subject: [PATCH] [cmake] require c++11 as the minimum standard + +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7144b0b..e9112f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,10 @@ project(p8-platform) + cmake_minimum_required(VERSION 2.8.9) + enable_language(CXX) + ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED YES) ++set(CMAKE_CXX_EXTENSIONS NO) ++ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) + + find_package(Threads REQUIRED) +-- +2.44.0 + diff --git a/tools/depends/target/p8-platform/Makefile b/tools/depends/target/p8-platform/Makefile index 4d3fd00cb4..e590c191da 100644 --- a/tools/depends/target/p8-platform/Makefile +++ b/tools/depends/target/p8-platform/Makefile @@ -2,7 +2,8 @@ include ../../Makefile.include P8-PLATFORM-VERSION ../../download-files.include DEPS = ../../Makefile.include Makefile P8-PLATFORM-VERSION ../../download-files.include \ 001-all-fix-c++17-support.patch \ 002-all-fixcmakeinstall.patch \ - 003-all-cmake_tweakversion.patch + 003-all-cmake_tweakversion.patch \ + 004-all-fix-cxx-standard.patch LIBDYLIB=$(PLATFORM)/build/$(BYPRODUCT) @@ -15,6 +16,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) cd $(PLATFORM); patch -p1 -i ../001-all-fix-c++17-support.patch cd $(PLATFORM); patch -p1 -i ../002-all-fixcmakeinstall.patch cd $(PLATFORM); patch -p1 -i ../003-all-cmake_tweakversion.patch + cd $(PLATFORM); patch -p1 -i ../004-all-fix-cxx-standard.patch cd $(PLATFORM)/build; $(CMAKE) -DBUILD_SHARED_LIBS=0 .. $(LIBDYLIB): $(PLATFORM) |