diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-16 19:52:45 +0100 |
| commit | aaa312e56871e89b97704e5ac8c686fe7966c122 (patch) | |
| tree | 63f6a6c3e89152025de942a0e68153a5cb868ecb /package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake | |
| parent | 9d097a780c0ffe2c9dbe146046d5b68123c47708 (diff) | |
| parent | b1e843d40eea9bc684436f4635018b7c19eb93ea (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake')
| -rw-r--r-- | package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake index a67998250..b8e077b94 100644 --- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake +++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake @@ -1,6 +1,6 @@ ---- libssh-0.5.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2012-11-20 12:41:49.000000000 +0100 -+++ libssh-0.5.3/cmake/Modules/DefineCompilerFlags.cmake 2013-12-17 13:20:04.073723090 +0100 -@@ -20,11 +20,6 @@ if (UNIX AND NOT WIN32) +--- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake 2014-02-06 10:20:57.000000000 +0100 ++++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake 2014-03-14 09:10:56.621673326 +0100 +@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") endif (WITH_FPIC) @@ -9,6 +9,6 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif (WITH_STACK_PROTECTOR) - - check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) - if (WITH_FORTIFY_SOURCE) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") + if (CMAKE_BUILD_TYPE) + string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) + if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel)) |