Mercurial > mxe-octave

changeset 2046:45dbac6fcb14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package libssh2: use libgcrypt instead of openssl
author Tony Theodore <tonyt@logyst.com>
date Mon, 24 Oct 2011 23:57:30 +1100
parents de8c8e74c6b5
children 5828a4a777a2
files src/curl.mk src/libssh2.mk
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/curl.mk	Mon Oct 24 20:23:02 2011 +1100
+++ b/src/curl.mk	Mon Oct 24 23:57:30 2011 +1100
@@ -27,8 +27,7 @@
         --prefix='$(PREFIX)/$(TARGET)' \
         --with-gnutls \
         --with-libidn \
-        LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs`\
-              `'i686-pc-mingw32-pkg-config' openssl --libs` -lssh2"
+        LIBS="-lgcrypt -liconv `$(PREFIX)/$(TARGET)/bin/gpg-error-config --libs` -lssh2"
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
 
     '$(TARGET)-gcc' \
--- a/src/libssh2.mk	Mon Oct 24 20:23:02 2011 +1100
+++ b/src/libssh2.mk	Mon Oct 24 23:57:30 2011 +1100
@@ -10,7 +10,7 @@
 $(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
+$(PKG)_DEPS     := gcc libgcrypt zlib
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://www.libssh2.org/download/?C=M;O=D' | \
@@ -24,6 +24,8 @@
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
+        --without-openssl \
+        --with-libgcrypt \
         PKG_CONFIG='$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=