From d407054b3772ec636e9d38248667c7f2baecd1d7 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 26 Jun 2014 14:48:12 +0200
Subject: convert to cmake style

---
 package/libssh/Makefile                            | 15 +++++------
 .../patches/patch-cmake_Modules_FindZLIB_cmake     | 29 ----------------------
 2 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake

(limited to 'package')

diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index ace6737ff..c421eeef3 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
 PKG_VERSION:=		0.6.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		66cf16e77f60913b4d54f18c92cdbf71
 PKG_DESCR:=		secure shell library
 PKG_SECTION:=		libs/net
@@ -20,14 +20,11 @@ include $(ADK_TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
-CONFIG_STYLE:=          manual
-
-do-configure:
-	(cd $(WRKBUILD) && PATH='${HOST_PATH}' \
-		cmake -DCMAKE_SYSTEM_NAME=Linux \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DOPENSSL_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' \
-		-DZLIB_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' $(WRKSRC)/)
+CONFIG_STYLE:=          cmake
+CMAKE_FLAGS:=		-DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \
+			-DOPENSSL_LIBRARIES='-lcrypto -lssl -lz' \
+			-DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \
+			-DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib'
 
 libssh-install:
 	$(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib
diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
deleted file mode 100644
index e7fcdfd2d..000000000
--- a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- libssh-0.6.3.orig/cmake/Modules/FindZLIB.cmake	2013-12-21 18:37:12.000000000 +0100
-+++ libssh-0.6.3/cmake/Modules/FindZLIB.cmake	2014-03-14 09:07:03.296701809 +0100
-@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
-         NAMES
-             zlib.h
-         PATHS
-+            ${ZLIB_ROOT_DIR}/include
-             /usr/local/include
-             /opt/local/include
-             /sw/include
-             /usr/lib/sfw/include
--            ${ZLIB_ROOT_DIR}/include
-     )
-     mark_as_advanced(ZLIB_INCLUDE_DIR)
- 
-@@ -99,12 +99,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI
-             zlib1
-             zlibd
-         PATHS
-+            ${ZLIB_ROOT_DIR}/lib
-             /usr/local/lib
-             /opt/local/lib
-             /sw/lib
-             /usr/sfw/lib/64
-             /usr/sfw/lib
--            ${ZLIB_ROOT_DIR}/lib
-     )
-     mark_as_advanced(ZLIB_LIBRARY)
- 
-- 
cgit v1.2.3