diff options
| author | Tony Theodore <tonyt@logyst.com> | 2011-10-24 12:57:30 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2011-10-24 12:57:30 (GMT) |
| commit | 7c5a6741b8311a555b2729a2c18f72a149f6fd48 (patch) | |
| tree | 5cbbf64c6b51aa72534abd393c4abae1c03a5827 /src | |
| parent | 726faf2eaa7e286250bf247aad819a6693de5802 (diff) | |
| download | mxe-7c5a6741b8311a555b2729a2c18f72a149f6fd48.zip mxe-7c5a6741b8311a555b2729a2c18f72a149f6fd48.tar.gz mxe-7c5a6741b8311a555b2729a2c18f72a149f6fd48.tar.bz2 | |
package libssh2: use libgcrypt instead of openssl
Diffstat (limited to 'src')
| -rw-r--r-- | src/curl.mk | 3 | ||||
| -rw-r--r-- | src/libssh2.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/curl.mk b/src/curl.mk index 18432d9..2cac7c3 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -27,8 +27,7 @@ define $(PKG)_BUILD --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' \ diff --git a/src/libssh2.mk b/src/libssh2.mk index 01ced79..36c9c82 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -10,7 +10,7 @@ $(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 +$(PKG)_DEPS := gcc libgcrypt zlib define $(PKG)_UPDATE wget -q -O- 'http://www.libssh2.org/download/?C=M;O=D' | \ @@ -24,6 +24,8 @@ define $(PKG)_BUILD --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= |