Merge pull request #11099 from nmav/tmp-libssh-checks

libssh: simplify endianness check

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 \
+	-UWITH_STACK_CLASH_PROTECTION \
-	-DWITH_TESTING:BOOL=OFF \
+	-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

libs/libssh/patches/001-compile.patch

@@ -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)