diff --git a/programming/library/libdispatch/actions.py b/programming/library/libdispatch/actions.py index 97ea26e512..b857fcf005 100644 --- a/programming/library/libdispatch/actions.py +++ b/programming/library/libdispatch/actions.py @@ -32,5 +32,5 @@ def install(): shelltools.cd("build") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.dodoc("../CONTRIBUTING.md", "../INSTALL.md", "../README.md", "../TESTING.md") + pisitools.dodoc("../INSTALL.md", "../README.md", "../TESTING.md") diff --git a/programming/library/libdispatch/files/remove-werror.patch b/programming/library/libdispatch/files/remove-werror.patch index 1c182360e6..f0a83c26f7 100644 --- a/programming/library/libdispatch/files/remove-werror.patch +++ b/programming/library/libdispatch/files/remove-werror.patch @@ -1,10 +1,11 @@ ---- cmake/modules/DispatchCompilerWarnings.cmake.orig 2020-05-12 13:13:59.619689872 +0300 -+++ cmake/modules/DispatchCompilerWarnings.cmake 2020-05-12 13:13:35.216171428 +0300 -@@ -2,7 +2,6 @@ - if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") - # TODO: someone needs to provide the msvc equivalent warning flags +diff --git a/cmake/modules/DispatchCompilerWarnings.cmake b/cmake/modules/DispatchCompilerWarnings.cmake +index b106444..bdb3f28 100644 +--- a/cmake/modules/DispatchCompilerWarnings.cmake ++++ b/cmake/modules/DispatchCompilerWarnings.cmake +@@ -6,7 +6,6 @@ elseif(WIN32) + # so that we can use __popcnt64 + add_compile_options($<$:-fms-extensions>) else() -- add_compile_options($<$,$>:-Werror>) - add_compile_options($<$,$>:-Wall>) - add_compile_options($<$,$>:-Wextra>) - +- add_compile_options($<$:-Werror>) + add_compile_options($<$:-Wall>) + add_compile_options($<$:-Wextra>) diff --git a/programming/library/libdispatch/pspec.xml b/programming/library/libdispatch/pspec.xml index a5ba1dace4..37b4f22ad7 100644 --- a/programming/library/libdispatch/pspec.xml +++ b/programming/library/libdispatch/pspec.xml @@ -20,6 +20,7 @@ avoid-libkqueue.patch + remove-werror.patch