libssh: simplified CMAKE tests

That is endianness check is provided as option, SSP and other
flags are enabled by openwrt global flags to fix issues in unsupported
systems, and unused flags were removed.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>

diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile
index 263548f5b6225da75ff3a1a0b4ef2c2410b6dbd5..0af8d34370a3a96812c25eaa4457423d9495a163 100644 (file)
--- a/libs/libssh/Makefile
+++ b/libs/libssh/Makefile
@@ -12,7 +12,7 @@ PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
 
 PKG_NAME:=libssh
 PKG_VERSION:=0.9.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://www.libssh.org/files/0.9/
@@ -54,13 +54,17 @@ CMAKE_OPTIONS = \
        -DWITH_PCAP:BOOL=OFF \
        -DWITH_SERVER:BOOL=ON \
        -DWITH_SFTP:BOOL=ON \
-       -DWITH_SSH1:BOOL=OFF \
-       -DWITH_TESTING:BOOL=OFF \
+       -UWITH_STACK_CLASH_PROTECTION \
+       -DWITH_STACK_CLASH_PROTECTION=0 \
+       -UWITH_STACK_PROTECTOR \
+       -DWITH_STACK_PROTECTOR=0 \
+       -UWITH_STACK_PROTECTOR_STRONG \
+       -DWITH_STACK_PROTECTOR_STRONG=0
 
 ifeq ($(CONFIG_BIG_ENDIAN),y)
-CMAKE_OPTIONS += -DWITH_BIG_ENDIAN=ON
+CMAKE_OPTIONS += -DHAVE_WORDS_BIGENDIAN=1
 else
-CMAKE_OPTIONS += -DWITH_BIG_ENDIAN=OFF
+CMAKE_OPTIONS += -DHAVE_WORDS_BIGENDIAN=0
 endif
 
 define Build/InstallDev

diff --git a/libs/libssh/patches/001-compile.patch b/libs/libssh/patches/001-compile.patch
deleted file mode 100644 (file)
index a0e57ef..0000000
--- a/libs/libssh/patches/001-compile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index c8bb2aa..344ba59 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -5,7 +5,6 @@ include(CheckFunctionExists)
- include(CheckLibraryExists)
- include(CheckTypeSize)
- include(CheckStructHasMember)
--include(TestBigEndian)
- 
- set(PACKAGE ${PROJECT_NAME})
- set(VERSION ${PROJECT_VERSION})
-@@ -465,6 +464,8 @@ if (WITH_GSSAPI AND NOT GSSAPI_FOUND)
- endif (WITH_GSSAPI AND NOT GSSAPI_FOUND)
- 
- # ENDIAN
--if (NOT WIN32)
--    test_big_endian(WORDS_BIGENDIAN)
--endif (NOT WIN32)
-+if (WITH_BIG_ENDIAN)
-+    set(WORDS_BIGENDIAN 1)
-+else (WITH_BIG_ENDIAN)
-+    set(WORDS_BIGENDIAN 0)
-+endif (WITH_BIG_ENDIAN)