diff options
Diffstat (limited to '0001-makepkg-Fix-compiler-check.patch')
| -rw-r--r-- | 0001-makepkg-Fix-compiler-check.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/0001-makepkg-Fix-compiler-check.patch b/0001-makepkg-Fix-compiler-check.patch index 6a870a396317..352e31f54c4a 100644 --- a/0001-makepkg-Fix-compiler-check.patch +++ b/0001-makepkg-Fix-compiler-check.patch @@ -1,4 +1,4 @@ -From 935af505d61e4f7e2324cd34833d24e6f789e61a Mon Sep 17 00:00:00 2001 +From f9d65dc25c5446a144f2542b486bd72d2ff1320d Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 14 Nov 2022 11:58:59 +0100 Subject: [PATCH] makepkg: Fix compiler check @@ -8,10 +8,10 @@ Subject: [PATCH] makepkg: Fix compiler check 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake -index 0227511b..048e350c 100644 +index 4acbeaab..c1c46bb2 100644 --- a/cmake/build_helpers.cmake +++ b/cmake/build_helpers.cmake -@@ -238,27 +238,27 @@ macro(createPackage) +@@ -259,27 +259,27 @@ macro(createPackage) elseif(UNIX AND NOT APPLE) set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION}) @@ -45,7 +45,7 @@ index 0227511b..048e350c 100644 set_target_properties(libimhex PROPERTIES SOVERSION ${IMHEX_VERSION}) set_property(TARGET main PROPERTY MACOSX_BUNDLE_INFO_PLIST ${MACOSX_BUNDLE_INFO_PLIST}) -@@ -271,7 +271,7 @@ macro(createPackage) +@@ -292,7 +292,7 @@ macro(createPackage) add_custom_target(build-time-make-resources-directory ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${IMHEX_BUNDLE_PATH}/Contents/Resources") downloadImHexPatternsFiles("${IMHEX_BUNDLE_PATH}/Contents/MacOS") @@ -54,21 +54,21 @@ index 0227511b..048e350c 100644 install(FILES ${IMHEX_ICON} DESTINATION "${IMHEX_BUNDLE_PATH}/Contents/Resources") install(TARGETS main BUNDLE DESTINATION ".") install(FILES $<TARGET_FILE:main> DESTINATION "${IMHEX_BUNDLE_PATH}") -@@ -391,8 +391,11 @@ function(downloadImHexPatternsFiles dest) +@@ -412,8 +412,11 @@ function(downloadImHexPatternsFiles dest) endfunction() macro(setupCompilerWarnings target) - set(IMHEX_COMMON_FLAGS "-Wall -Wextra -Wpedantic -Werror") -- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds") +- set(IMHEX_C_FLAGS "${IMHEX_COMMON_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds -Wno-dangling-reference") + set(IMHEX_C_FLAGS "") + + if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") -+ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds") ++ set(IMHEX_C_FLAGS "${IMHEX_C_FLAGS} -Wno-restrict -Wno-stringop-overread -Wno-stringop-overflow -Wno-array-bounds -Wno-dangling-reference") + endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IMHEX_C_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IMHEX_C_FLAGS}") -@@ -406,7 +409,7 @@ macro(setUninstallTarget) +@@ -427,7 +430,7 @@ macro(setUninstallTarget) "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) @@ -78,5 +78,5 @@ index 0227511b..048e350c 100644 COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) endif() -- -2.40.0 +2.40.1 |