d117d5783e
Tag patch (forwarded request 199288 from jmcdough) OBS-URL: https://build.opensuse.org/request/show/199290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csync?expand=0&rev=19
47 lines
2.2 KiB
Diff
47 lines
2.2 KiB
Diff
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)
|
|
|