cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12235 from jefferyto/python-openssl-ca-certs-openwrt-18.06

Browse Source 
[openwrt-18.06] python-openssl,python3-openssl: Add dependency on ca-bundle
This commit is contained in:
Rosen Penev
2020-05-20 09:21:37 -07:00
committed by GitHub
parent 8b23a429bb 76a67189c5
commit 24d14e8b35
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python/python/Makefile
+2 -2
View File
@@ -12,7 +12,7 @@ include ../python-version.mk
PKG_NAME:=python PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
@@ -268,7 +268,7 @@ define PyPackage/python/filespec
endef endef
HOST_LDFLAGS += \ 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) ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \ HOST_LDFLAGS += \
lang/python/python/files/python-package-openssl.mk
+1 -1
View File
@@ -8,7 +8,7 @@
define Package/python-openssl define Package/python-openssl
$(call Package/python/Default) $(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) SSL module TITLE:=Python $(PYTHON_VERSION) SSL module
DEPENDS:=+python-light +libopenssl DEPENDS:=+python-light +libopenssl +ca-bundle
endef endef
$(eval $(call PyBasePackage,python-openssl, \ $(eval $(call PyBasePackage,python-openssl, \
lang/python/python3/Makefile
+2 -2
View File
@@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO) PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
PKG_NAME:=python3 PKG_NAME:=python3
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
@@ -264,7 +264,7 @@ define Py3Package/python3/filespec
endef endef
HOST_LDFLAGS += \ 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) ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \ HOST_LDFLAGS += \
lang/python/python3/files/python3-package-openssl.mk
+1 -1
View File
@@ -8,7 +8,7 @@
define Package/python3-openssl define Package/python3-openssl
$(call Package/python3/Default) $(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) SSL module TITLE:=Python $(PYTHON3_VERSION) SSL module
DEPENDS:=+python3-light +libopenssl DEPENDS:=+python3-light +libopenssl +ca-bundle
endef endef
$(eval $(call Py3BasePackage,python3-openssl, \ $(eval $(call Py3BasePackage,python3-openssl, \