From 346e5341b1f5bad2b257bd7658669fbfac7a3bec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 17 Dec 2013 13:21:07 +0100 Subject: remove stack protector check --- package/libssh/Makefile | 2 +- .../patches/patch-cmake_Modules_DefineCompilerFlags_cmake | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake (limited to 'package/libssh') diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 871f1e2b5..8d7b455fb 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libssh PKG_VERSION:= 0.5.3 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 9ad01838d3b89d98e900e0f6260a88cc PKG_DESCR:= SSH library PKG_SECTION:= libs diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake new file mode 100644 index 000000000..a67998250 --- /dev/null +++ b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake @@ -0,0 +1,14 @@ +--- 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) + 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) +- + 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") -- cgit v1.2.3