libssh: fix zlib detection

- currently zlib is never detected, although there is a dependency on
  it, fix that.
- change links from http to https

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper
2018-01-30 15:06:06 +01:00
parent 14f5d40714
commit 902542faa0
+6 -5
View File
@@ -1,5 +1,5 @@
# #
# Copyright (C) 2015-2016 OpenWrt.org # Copyright (C) 2015-2018 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libssh2 PKG_NAME:=libssh2
PKG_VERSION:=1.7.0 PKG_VERSION:=1.7.0
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.libssh2.org/download PKG_SOURCE_URL:=https://www.libssh2.org/download
PKG_MD5SUM:=b01662a210e94cccf2f76094db7dac5c PKG_MD5SUM:=b01662a210e94cccf2f76094db7dac5c
PKG_INSTALL:=1 PKG_INSTALL:=1
@@ -26,7 +26,7 @@ define Package/libssh2
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=SSH2 library TITLE:=SSH2 library
URL:=http://www.libssh2.org/ URL:=https://www.libssh2.org/
DEPENDS:=+libopenssl +zlib DEPENDS:=+libopenssl +zlib
MAINTAINER:=Jiri Slachta <jiri@slachta.eu> MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
endef endef
@@ -39,7 +39,8 @@ TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--disable-examples-build \ --disable-examples-build \
--with-libssl-prefix=$(STAGING_DIR)/usr --with-libssl-prefix=$(STAGING_DIR)/usr \
--with-libz-prefix=$(STAGING_DIR)/usr
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include