summaryrefslogtreecommitdiffstats
path: root/package/python-web2py/python-web2py.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/python-web2py/python-web2py.mk')
-rw-r--r--package/python-web2py/python-web2py.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk
index 887925b64e..9ad5a7785a 100644
--- a/package/python-web2py/python-web2py.mk
+++ b/package/python-web2py/python-web2py.mk
@@ -4,11 +4,12 @@
#
################################################################################
-PYTHON_WEB2PY_VERSION = R-2.14.6
+PYTHON_WEB2PY_VERSION = R-2.15.4
PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
PYTHON_WEB2PY_LICENSE = LGPL-3.0
PYTHON_WEB2PY_LICENSE_FILES = LICENSE
-PYTHON_WEB2PY_DEPENDENCIES = python python-pydal host-python-pydal
+PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \
+ python-pydal host-python-pydal
PYTHON_WEB2PY_EXCLUSIONS = \
welcome.w2p \
@@ -30,7 +31,7 @@ PYTHON_WEB2PY_EXCLUSIONS = \
tox.ini
define PYTHON_WEB2PY_GENERATE_PASSWORD
- $(HOST_DIR)/bin/python2 -c 'import os; \
+ $(HOST_DIR)/bin/python -c 'import os; \
os.chdir("$(@D)"); \
from gluon.main import save_password; \
save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'
OpenPOWER on IntegriCloud