Mercurial > mxe-octave

comparison Makefile.in @ 5494:898c27394c57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5493:dace3d372190 5494:898c27394c57
278 REQUIREMENTS += makeinfo xz 278 REQUIREMENTS += makeinfo xz
279 BUILD_TOOLS := $(filter-out build-texinfo build-xz, $(BUILD_TOOLS)) 279 BUILD_TOOLS := $(filter-out build-texinfo build-xz, $(BUILD_TOOLS))
280 endif 280 endif
281 # use the a native python in native mingw 281 # use the a native python in native mingw
282 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 282 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
283 REQUIREMENTS += python 283 REQUIREMENTS += python3
284 BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS)) 284 BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS))
285 endif 285 endif
286 PYTHON3 ?= python3
286 287
287 # use the a native awk in native mingw 288 # use the a native awk in native mingw
288 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 289 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
289 REQUIREMENTS += awk 290 REQUIREMENTS += awk
290 BUILD_TOOLS := $(filter-out build-gawk, $(BUILD_TOOLS)) 291 BUILD_TOOLS := $(filter-out build-gawk, $(BUILD_TOOLS))
655 define MSYS2_PKG_BUILD 656 define MSYS2_PKG_BUILD
656 cd '$(1)/' && \ 657 cd '$(1)/' && \
657 mkdir -p '$(3)' && \ 658 mkdir -p '$(3)' && \
658 (tar cf $(3)/$($(PKG)_FILE) '.') && \ 659 (tar cf $(3)/$($(PKG)_FILE) '.') && \
659 (TMP="$(3)" \ 660 (TMP="$(3)" \
660 $(TOP_DIR)/tools/msys2-install.py --verbose --msys-dir="$(MSYS2_DIR)" "$(3)/$($(PKG)_FILE)") 661 $(PYTHON3) $(TOP_DIR)/tools/msys2-install.py --verbose --msys-dir="$(MSYS2_DIR)" "$(3)/$($(PKG)_FILE)")
661 endef 662 endef
662 663
663 define MSYS2_PKG_UPDATE 664 define MSYS2_PKG_UPDATE
664 $(WGET) -q -O- '$(MSYS2_URL)/' | \ 665 $(WGET) -q -O- '$(MSYS2_URL)/' | \
665 $(GREP) $($(PKG)_NAME) | $(GREP) "$($(PKG)_FILTER)" | \ 666 $(GREP) $($(PKG)_NAME) | $(GREP) "$($(PKG)_FILTER)" | \
829 tar cfz $($(PKG)_FILE) $($(PKG)_SUBDIR) && \ 830 tar cfz $($(PKG)_FILE) $($(PKG)_SUBDIR) && \
830 OCTAVE_CONFIG=$(MXE_OCTAVECONFIG) TMP="$(1)/.." \ 831 OCTAVE_CONFIG=$(MXE_OCTAVECONFIG) TMP="$(1)/.." \
831 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ 832 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
832 MKOCTFILE=$(MXE_MKOCTFILE) MAKE=$(MAKE) \ 833 MKOCTFILE=$(MXE_MKOCTFILE) MAKE=$(MAKE) \
833 CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \ 834 CONFIGURE_OPTIONS="$(HOST_AND_BUILD_CONFIGURE_OPTIONS)" $(4) \
834 $(TOP_DIR)/tools/pkg-install.py install -verbose "$($(PKG)_FILE)"; \ 835 $(PYTHON3) $(TOP_DIR)/tools/pkg-install.py install -verbose "$($(PKG)_FILE)"; \
835 fi 836 fi
836 endef 837 endef
837 endif 838 endif
838 839
839 define OCTAVE_FORGE_PKG_UPDATE 840 define OCTAVE_FORGE_PKG_UPDATE