From 31b2ea2bcf3a937df06494497224a5cad301ef10 Mon Sep 17 00:00:00 2001 From: jmcarcell <jmcarcell@users.noreply.github.com> Date: Fri, 10 Jan 2025 08:27:30 +0100 Subject: [PATCH 1/2] starlight: apply patch and don't build with -Werror --- generators/CMakeLists.txt | 1 + generators/patches/starlight-r313.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 0617a33247..99691d429d 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1132,6 +1132,7 @@ LCGPackage_Add( CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/slight.in ./config/slight.in ENDIF + PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/starlight-<NATIVE_VERSION>.patch UPDATE_COMMAND <VOID> CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -Wno-array-parameter -Wno-unused-but-set-variable -Wno-unknown-warning-option" ) diff --git a/generators/patches/starlight-r313.patch b/generators/patches/starlight-r313.patch index 9b790addfa..cc9939404d 100644 --- a/generators/patches/starlight-r313.patch +++ b/generators/patches/starlight-r313.patch @@ -27,7 +27,7 @@ else() message(STATUS "Not GCC") - set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror") -+ set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -Wno-error=unused-private-field -Wno-error=sometimes-uninitialized -Wno-unused-but-set-variable -Wno-array-parameter -Wno-deprecated-register -Wno-unknown-warning-option") ++ set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-error=unused-private-field -Wno-error=sometimes-uninitialized -Wno-unused-but-set-variable -Wno-array-parameter -Wno-deprecated-register -Wno-unknown-warning-option") if(CPP11) message(WARNING "C++11 feautures not supported for your compiler") endif() -- GitLab From 60bd731667de85d35d3fbaa7660b65a20639569b Mon Sep 17 00:00:00 2001 From: jmcarcell <jmcarcell@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:21:59 +0100 Subject: [PATCH 2/2] Remove patch command since it's the default --- generators/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index 99691d429d..0617a33247 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1132,7 +1132,6 @@ LCGPackage_Add( CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/generators/slight.in ./config/slight.in ENDIF - PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/patches/starlight-<NATIVE_VERSION>.patch UPDATE_COMMAND <VOID> CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -Wno-array-parameter -Wno-unused-but-set-variable -Wno-unknown-warning-option" ) -- GitLab