Merge pull request #10002 from cshoredaniel/pr-19.07-uwsgi-cgi-backport

[19.07] uwsgi-cgi: use python3 hostpkg not system python3
This commit is contained in:
Rosen Penev 2019-09-15 07:16:19 -07:00 committed by GitHub
commit 335240c842
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions

View file

@ -15,6 +15,8 @@ PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com> PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
PKG_BUILD_DEPENDS:=python3/host
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/uwsgi-cgi define Package/uwsgi-cgi
@ -39,7 +41,8 @@ define Package/uwsgi-cgi/description
endef endef
MAKE_VARS+=\ MAKE_VARS+=\
CPP=$(TARGET_CROSS)cpp CPP=$(TARGET_CROSS)cpp \
PYTHON=$(STAGING_DIR_HOSTPKG)/bin/python3
define Build/Compile define Build/Compile
$(call Build/Compile/Default,PROFILE=cgi) $(call Build/Compile/Default,PROFILE=cgi)

View file

@ -0,0 +1,10 @@
Index: uwsgi-2.0.18/Makefile
===================================================================
--- uwsgi-2.0.18.orig/Makefile
+++ uwsgi-2.0.18/Makefile
@@ -1,4 +1,4 @@
-PYTHON := python
+PYTHON ?= python3
all:
$(PYTHON) uwsgiconfig.py --build $(PROFILE)