Merge pull request #12235 from jefferyto/python-openssl-ca-certs-openwrt-18.06
[openwrt-18.06] python-openssl,python3-openssl: Add dependency on ca-bundle
This commit is contained in:
commit
24d14e8b35
4 changed files with 6 additions and 6 deletions
|
@ -12,7 +12,7 @@ include ../python-version.mk
|
|||
|
||||
PKG_NAME:=python
|
||||
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
||||
|
@ -268,7 +268,7 @@ define PyPackage/python/filespec
|
|||
endef
|
||||
|
||||
HOST_LDFLAGS += \
|
||||
$$$$(pkg-config --static --libs libcrypto libssl)
|
||||
$$$$(pkg-config --static --libs libcrypto libssl) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib
|
||||
|
||||
ifeq ($(HOST_OS),Linux)
|
||||
HOST_LDFLAGS += \
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
define Package/python-openssl
|
||||
$(call Package/python/Default)
|
||||
TITLE:=Python $(PYTHON_VERSION) SSL module
|
||||
DEPENDS:=+python-light +libopenssl
|
||||
DEPENDS:=+python-light +libopenssl +ca-bundle
|
||||
endef
|
||||
|
||||
$(eval $(call PyBasePackage,python-openssl, \
|
||||
|
|
|
@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
|
|||
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
|
||||
|
||||
PKG_NAME:=python3
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
|
||||
|
||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||
|
@ -264,7 +264,7 @@ define Py3Package/python3/filespec
|
|||
endef
|
||||
|
||||
HOST_LDFLAGS += \
|
||||
$$$$(pkg-config --static --libs libcrypto libssl)
|
||||
$$$$(pkg-config --static --libs libcrypto libssl) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib
|
||||
|
||||
ifeq ($(HOST_OS),Linux)
|
||||
HOST_LDFLAGS += \
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
define Package/python3-openssl
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) SSL module
|
||||
DEPENDS:=+python3-light +libopenssl
|
||||
DEPENDS:=+python3-light +libopenssl +ca-bundle
|
||||
endef
|
||||
|
||||
$(eval $(call Py3BasePackage,python3-openssl, \
|
||||
|
|
Loading…
Reference in a new issue