janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

make, scripts: Flip some more switches from pathon 2 to 3 (untested!)

Browse source 
This commit flips some more switches from Python 2 to Python 3 in makefiles and
Python code. Build runs through, but it's still likely to break things.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-02 12:28:13 +00:00
commit 13fa28e23f
6 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/py-defs.mk
View file

@ -1,11 +1,15 @@
ENV_PYTHONPATH := $(PYTHONPATH)
PYTHON ?= python2
#PYTHON = python3
ifeq ($(PYTHON),)
PYTHON_VERSION ?= 3
PYTHON ?= /usr/bin/python$(PYTHON_VERSION)
else
PYTHON_VERSION ?= $(patsubst python%,%,$(notdir $(PYTHON)))
endif
ifneq ($(DEVELOPMENT),true)
PY_SITE_PACKAGES_PATH := $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")
else
PY_SITE_PACKAGES_PATH := $(PREFIX)/python2/site-packages
PY_SITE_PACKAGES_PATH := $(PREFIX)/python$(PYTHON_VERSION)/site-packages
endif
PY_PREREQ_BUILD ?= $(shell $(proj_query_cmd) pkg-requires --subsections jw -d ' ' -p --no-version build $(PROJECT))