app-editors/imhex: fix patching
This commit is contained in:
parent
77b5c8ed32
commit
74e48a4c74
3 changed files with 39 additions and 4 deletions
24
app-editors/imhex/files/remove_Werror.patch
Normal file
24
app-editors/imhex/files/remove_Werror.patch
Normal file
|
@ -0,0 +1,24 @@
|
|||
Remove the different Werror flags we can find used
|
||||
Should fix https://bugs.gentoo.org/921663
|
||||
--- a/lib/external/pattern_language/cli/CMakeLists.txt
|
||||
+++ b/lib/external/pattern_language/cli/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ else()
|
||||
find_package(CLI11 CONFIG QUIET)
|
||||
endif()
|
||||
|
||||
-target_compile_options(plcli PRIVATE -Wall -Wextra -Werror -Wno-unknown-pragmas -Wno-array-bounds)
|
||||
+target_compile_options(plcli PRIVATE -Wall -Wextra -Wno-unknown-pragmas -Wno-array-bounds)
|
||||
target_include_directories(plcli PUBLIC include ${CLI11_INCLUDE_DIRS})
|
||||
target_link_libraries(plcli PRIVATE ${CLI11_LIBRARIES} ${NLOHMANN_JSON_LIBRARIES} libpl libpl-gen ${FMT_LIBRARIES})
|
||||
|
||||
--- a/lib/external/pattern_language/lib/CMakeLists.txt
|
||||
+++ b/lib/external/pattern_language/lib/CMakeLists.txt
|
||||
@@ -86,7 +86,7 @@ if (LIBPL_ENABLE_PRECOMPILED_HEADERS)
|
||||
endif ()
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
|
||||
- target_compile_options(libpl PRIVATE -Wall -Wextra -Werror -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
||||
+ target_compile_options(libpl PRIVATE -Wall -Wextra -Wpedantic -Wno-unknown-pragmas -Wno-array-bounds)
|
||||
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
|
||||
target_compile_options(libpl PRIVATE -Wno-stringop-overflow)
|
||||
endif()
|
14
app-editors/imhex/files/remove_dotnet.patch
Normal file
14
app-editors/imhex/files/remove_dotnet.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
Remove the compilation step that needs dotnet
|
||||
https://bugs.gentoo.org/926761
|
||||
--- a/plugins/script_loader/CMakeLists.txt
|
||||
+++ b/plugins/script_loader/CMakeLists.txt
|
||||
@@ -45,8 +45,4 @@ if (CoreClrEmbed_FOUND)
|
||||
if (IMHEX_BUNDLE_DOTNET)
|
||||
install(FILES ${CoreClrEmbed_SHARED_LIBRARIES} DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
endif ()
|
||||
-
|
||||
- add_subdirectory(dotnet)
|
||||
- add_dependencies(script_loader AssemblyLoader)
|
||||
-
|
||||
endif ()
|
||||
\ No newline at end of file
|
Loading…
Add table
Add a link
Reference in a new issue