changeset 2021:1467d5e5fd6d

package libssh2: add missing dependencies and test program
author Tony Theodore <tonyt@logyst.com>
date Fri, 21 Oct 2011 03:33:35 +1100
parents d8e7b20c4451
children a8051ff4b885
files src/libssh2-test.c src/libssh2.mk
diffstat 2 files changed, 48 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libssh2-test.c	Fri Oct 21 03:33:35 2011 +1100
@@ -0,0 +1,14 @@
+/* This file is part of mingw-cross-env.       */
+/* See doc/index.html for further information. */
+
+#include <stdio.h>
+#include <libssh2.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+    
+    printf("libssh2 version: %s", libssh2_version(0) );
+    return 0;
+}
--- a/src/libssh2.mk	Fri Oct 21 02:34:14 2011 +1100
+++ b/src/libssh2.mk	Fri Oct 21 03:33:35 2011 +1100
@@ -1,29 +1,34 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
-
-# libssh2
-PKG             := libssh2
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.0
-$(PKG)_CHECKSUM := d342e06abe38a29b1bbb9c58d50dd093eab0bee9
-$(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
-$(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://www.libssh2.org
-$(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
-
-define $(PKG)_UPDATE
-    wget -q -O- 'http://www.libssh2.org/download/' | \
-    grep 'libssh2-' | \
-    $(SED) -n 's,.*libssh2-\([0-9][^>]*\)\.tar.*,\1,p' | \
-    head -1
-endef
-
-define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --disable-shared \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        PKG_CONFIG='$(TARGET)-pkg-config'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
-endef
+# This file is part of mingw-cross-env.
+# See doc/index.html for further information.
+
+# libssh2
+PKG             := libssh2
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 1.3.0
+$(PKG)_CHECKSUM := d342e06abe38a29b1bbb9c58d50dd093eab0bee9
+$(PKG)_SUBDIR   := libssh2-$($(PKG)_VERSION)
+$(PKG)_FILE     := libssh2-$($(PKG)_VERSION).tar.gz
+$(PKG)_WEBSITE  := http://www.libssh2.org
+$(PKG)_URL      := http://www.libssh2.org/download/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc openssl zlib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://www.libssh2.org/download/' | \
+    grep 'libssh2-' | \
+    $(SED) -n 's,.*libssh2-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        PKG_CONFIG='$(TARGET)-pkg-config'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
+
+    '$(TARGET)-gcc' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libssh2.exe' \
+        -lssh2
+endef