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

diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index 6ad838909db797e5de6e4636db5921fc1112e08f..a192a65be0f083735f2df3ae220bc63c2c2e9534 100644 (file)
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -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 += \

diff --git a/lang/python/python/files/python-package-openssl.mk b/lang/python/python/files/python-package-openssl.mk
index dbf6fe18073108424e0fe5ad0e356219db42af38..efb6f6ef39ae5af75f6092d00c0a4c33ae598623 100644 (file)
--- a/lang/python/python/files/python-package-openssl.mk
+++ b/lang/python/python/files/python-package-openssl.mk
@@ -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, \

diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 32b564cb4d7c4f88477690aefd0b803e125d1552..5ea8019a2e28de99019f7ee0911211db6252a2f5 100644 (file)
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -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 += \

diff --git a/lang/python/python3/files/python3-package-openssl.mk b/lang/python/python3/files/python3-package-openssl.mk
index 6971993f73dca5c7780576b6ac2622de2ab4c525..f1308d6b76e584342e1b02d029b3d81952631287 100644 (file)
--- a/lang/python/python3/files/python3-package-openssl.mk
+++ b/lang/python/python3/files/python3-package-openssl.mk
@@ -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, \