File fix-cmake-on-pre-12.patch of Package csync

Overview Repositories Revisions Requests Users Attributes Meta

File fix-cmake-on-pre-12.patch of Package csync (Revision ea0c0090e05597d60d36fa7cfc1e3104)

Currently displaying revision ea0c0090e05597d60d36fa7cfc1e3104 , Show latest

Index: csync-0.50.0/cmake/Modules/DefineCompilerFlags.cmake
===================================================================
--- csync-0.50.0.orig/cmake/Modules/DefineCompilerFlags.cmake
+++ csync-0.50.0/cmake/Modules/DefineCompilerFlags.cmake
@@ -10,7 +10,7 @@ if (UNIX AND NOT WIN32)
     if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
 
         # add -Wconversion ?
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
@@ -28,7 +28,7 @@ if (UNIX AND NOT WIN32)
 
         if (CMAKE_BUILD_TYPE)
             string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-            if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))
+            if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)")
                 check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
                 if (WITH_FORTIFY_SOURCE)
                     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
Index: csync-0.50.0/cmake/Modules/FindIconv.cmake
===================================================================
--- csync-0.50.0.orig/cmake/Modules/FindIconv.cmake
+++ csync-0.50.0/cmake/Modules/FindIconv.cmake
@@ -16,7 +16,6 @@
 include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(CheckLibraryExists)
-include(CheckPrototypeDefinition)
 
 find_path(ICONV_INCLUDE_DIR
     NAMES
@@ -52,11 +51,6 @@ if (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)
     endif (HAVE_SYS_ICONV_H)
 
     set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-    check_prototype_definition(iconv
-        "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)"
-        "-1"
-        ${_ICONV_PROTO_INCLUDE}
-        HAVE_ICONV_CONST)
     set(CMAKE_REQUIRED_INCLUDES)
 endif (HAVE_ICONV_H OR HAVE_SYS_ICONV_H)

Places

File fix-cmake-on-pre-12.patch of Package csync (Revision ea0c0090e05597d60d36fa7cfc1e3104)

Places