You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.6 KiB
52 lines
1.6 KiB
Index: client/CMakeLists.txt |
|
--- client/CMakeLists.txt.orig 2012-05-22 23:07:34.000000000 +0200 |
|
+++ client/CMakeLists.txt 2014-02-09 17:14:59.560514809 +0100 |
|
@@ -21,6 +21,7 @@ |
|
set(CLIENT_LINK_LIBRARIES |
|
${CLIENT_EXECUTABLE} |
|
${CSYNC_LIBRARY} |
|
+ ${CLIENT_LINK_LIBRARIES} |
|
) |
|
|
|
if(NOT LINUX) |
|
Index: cmake/Modules/DefineCompilerFlags.cmake |
|
--- cmake/Modules/DefineCompilerFlags.cmake.orig 2014-02-09 17:14:59.560514000 +0100 |
|
+++ cmake/Modules/DefineCompilerFlags.cmake 2014-02-09 17:15:58.850598122 +0100 |
|
@@ -21,11 +21,6 @@ |
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") |
|
endif (WITH_FPIC) |
|
|
|
- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) |
|
- if (WITH_STACK_PROTECTOR) |
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") |
|
- endif (WITH_STACK_PROTECTOR) |
|
- |
|
if (CMAKE_BUILD_TYPE) |
|
string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) |
|
if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") |
|
Index: src/std/c_file.c |
|
--- src/std/c_file.c.orig 2014-02-09 16:54:34.000000000 +0100 |
|
+++ src/std/c_file.c 2014-02-09 17:14:59.570597074 +0100 |
|
@@ -132,14 +132,22 @@ |
|
/* done */ |
|
break; |
|
} else if (bread < 0) { |
|
+#if defined(EIO) && !defined(ENODATA) |
|
+ errno = EIO; |
|
+#else |
|
errno = ENODATA; |
|
+#endif |
|
rc = -1; |
|
goto out; |
|
} |
|
|
|
bwritten = write(dstfd, buf, bread); |
|
if (bwritten < 0) { |
|
+#if defined(EIO) && !defined(ENODATA) |
|
+ errno = EIO; |
|
+#else |
|
errno = ENODATA; |
|
+#endif |
|
rc = -1; |
|
goto out; |
|
}
|
|
|