Mercurial > mxe-octave
diff Makefile.in @ 5494:898c27394c57
Use python3 in scripts (bug #58689).
* Makefile.in: native mingw, depend on python3, set PYTHON3 var
* tools/msys2-install.py: update for python3 syntax
* tools/pkg-install.py: update for python3 syntax
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 04 Jul 2020 12:14:29 -0400 |
parents | 10d9403ec6bc |
children | fb50ae69121c |
line wrap: on
line diff
--- a/Makefile.in Thu Jul 23 12:29:32 2020 -0400 +++ b/Makefile.in Sat Jul 04 12:14:29 2020 -0400 @@ -280,9 +280,10 @@ endif # use the a native python in native mingw ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) - REQUIREMENTS += python + REQUIREMENTS += python3 BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS)) endif +PYTHON3 ?= python3 # use the a native awk in native mingw ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) @@ -657,7 +658,7 @@ mkdir -p '$(3)' && \ (tar cf $(3)/$($(PKG)_FILE) '.') && \ (TMP="$(3)" \ - $(TOP_DIR)/tools/msys2-install.py --verbose --msys-dir="$(MSYS2_DIR)" "$(3)/$($(PKG)_FILE)") + $(PYTHON3) $(TOP_DIR)/tools/msys2-install.py --verbose --msys-dir="$(MSYS2_DIR)" "$(3)/$($(PKG)_FILE)") endef define MSYS2_PKG_UPDATE @@ -831,7 +832,7 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ MKOCTFILE=$(MXE_MKOCTFILE) MAKE=$(MAKE) \ CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \ - $(TOP_DIR)/tools/pkg-install.py install -verbose "$($(PKG)_FILE)"; \ + $(PYTHON3) $(TOP_DIR)/tools/pkg-install.py install -verbose "$($(PKG)_FILE)"; \ fi endef endif