diff options
| author | Lumir Balhar <lbalhar@redhat.com> | 2018-07-09 12:38:59 +0200 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2018-11-23 17:37:56 +1100 |
| commit | 8113c00b99d303c8073a2493f6b8978600e54967 (patch) | |
| tree | d23de9f523907c6e03c89dbe2a1f8a9f6e8d7446 | |
| parent | 11738cf01f150afae913b88fb68675a272803d63 (diff) | |
| download | device-tree-compiler-8113c00b99d303c8073a2493f6b8978600e54967.tar.gz | |
pylibfdt: Allow switch to Python 3 via environment variable PYTHON
Python 2 is still the default but it can be changed by
setting environment variable PYTHON before build/test.
Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | pylibfdt/Makefile.pylibfdt | 4 | ||||
| -rw-r--r-- | tests/Makefile.tests | 6 | ||||
| -rwxr-xr-x | tests/run_tests.sh | 2 |
4 files changed, 8 insertions, 7 deletions
@@ -24,6 +24,7 @@ BISON = bison LEX = flex SWIG = swig PKG_CONFIG ?= pkg-config +PYTHON ?= python2 INSTALL = /usr/bin/install INSTALL_PROGRAM = $(INSTALL) @@ -147,7 +148,7 @@ all: $(BIN) libfdt # We need both Python and swig to build/install pylibfdt. # This builds the given make ${target} if those deps are found. check_python_deps = \ - if $(PKG_CONFIG) --cflags python2 >/dev/null 2>&1; then \ + if $(PKG_CONFIG) --cflags $(PYTHON) >/dev/null 2>&1; then \ if which swig >/dev/null 2>&1; then \ can_build=yes; \ fi; \ diff --git a/pylibfdt/Makefile.pylibfdt b/pylibfdt/Makefile.pylibfdt index 8f00b3d..f6abe02 100644 --- a/pylibfdt/Makefile.pylibfdt +++ b/pylibfdt/Makefile.pylibfdt @@ -13,10 +13,10 @@ endif $(PYMODULE): $(PYLIBFDT_srcs) $(LIBFDT_archive) $(SETUP) $(VERSION_FILE) @$(VECHO) PYMOD $@ - $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_objdir) + $(PYTHON) $(SETUP) $(SETUPFLAGS) build_ext --build-lib=../$(PYLIBFDT_objdir) install_pylibfdt: $(PYMODULE) @$(VECHO) INSTALL-PYLIB - $(SETUP) $(SETUPFLAGS) install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX)) + $(PYTHON) $(SETUP) $(SETUPFLAGS) install $(if $(SETUP_PREFIX),--prefix=$(SETUP_PREFIX)) PYLIBFDT_cleanfiles = libfdt_wrap.c libfdt.py libfdt.pyc _libfdt.so diff --git a/tests/Makefile.tests b/tests/Makefile.tests index 6ddf444..8b63f60 100644 --- a/tests/Makefile.tests +++ b/tests/Makefile.tests @@ -81,18 +81,18 @@ tests_clean: rm -rf $(TESTS_CLEANDIRS) check: tests ${TESTS_BIN} $(TESTS_PYLIBFDT) - cd $(TESTS_PREFIX); ./run_tests.sh + cd $(TESTS_PREFIX); PYTHON=$(PYTHON) ./run_tests.sh ifeq ($(NO_VALGRIND),1) checkm: @echo "make checkm requires valgrind, but NO_VALGRIND=1" else checkm: tests ${TESTS_BIN} $(TESTS_PYLIBFDT) - cd $(TESTS_PREFIX); ./run_tests.sh -m + cd $(TESTS_PREFIX); PYTHON=$(PYTHON) ./run_tests.sh -m endif checkv: tests ${TESTS_BIN} $(TESTS_PYLIBFDT) - cd $(TESTS_PREFIX); ./run_tests.sh -v + cd $(TESTS_PREFIX); PYTHON=$(PYTHON) ./run_tests.sh -v ifneq ($(DEPTARGETS),) -include $(TESTS_DEPFILES) diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 547aedc..23e6176 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -933,7 +933,7 @@ fdtoverlay_tests() { pylibfdt_tests () { run_dtc_test -I dts -O dtb -o test_props.dtb test_props.dts TMP=/tmp/tests.stderr.$$ - python pylibfdt_tests.py -v 2> $TMP + $PYTHON pylibfdt_tests.py -v 2> $TMP # Use the 'ok' message meaning the test passed, 'ERROR' meaning it failed # and the summary line for total tests (e.g. 'Ran 17 tests in 0.002s'). |