Mercurial > mxe-octave

changeset 5861:44be3d301611

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch NSIS and its dependencies to use python3. * src/nsis.mk: Remove dependency "build-python". Let scons use its preferred version of python. * src/build-scons.mk, src/build-setuptools.mk: Build with python3.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 21 Aug 2021 13:10:09 +0200
parents 0474c7d212f6
children aecbfb30131d
files src/build-scons.mk src/build-setuptools.mk src/nsis.mk
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-scons.mk	Sat Aug 21 15:57:52 2021 +0200
+++ b/src/build-scons.mk	Sat Aug 21 13:10:09 2021 +0200
@@ -11,7 +11,7 @@
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
     $(PKG)_DEPS     := 
 else
-    $(PKG)_DEPS     := build-python
+    $(PKG)_DEPS     := build-python3
 endif
 
 define $(PKG)_UPDATE
@@ -21,5 +21,5 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && python setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
--- a/src/build-setuptools.mk	Sat Aug 21 15:57:52 2021 +0200
+++ b/src/build-setuptools.mk	Sat Aug 21 13:10:09 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := setuptools-$($(PKG)_VERSION)
 $(PKG)_FILE     := setuptools-$($(PKG)_VERSION).zip
 $(PKG)_URL      := https://files.pythonhosted.org/packages/b2/40/4e00501c204b457f10fe410da0c97537214b2265247bc9a5bc6edd55b9e4/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python
+$(PKG)_DEPS     := build-python3
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,5 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && python2 setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
--- a/src/nsis.mk	Sat Aug 21 15:57:52 2021 +0200
+++ b/src/nsis.mk	Sat Aug 21 13:10:09 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := nsis-$($(PKG)_VERSION)-src
 $(PKG)_FILE     := nsis-$($(PKG)_VERSION)-src.tar.bz2
 $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 3/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python build-scons build-setuptools
+$(PKG)_DEPS     := build-scons build-setuptools
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://nsis.sourceforge.io/Download' | \
@@ -26,7 +26,7 @@
 
 define $(PKG)_BUILD
     $($(PKG)_PREBUILD)
-    cd '$(1)' && python2 $(shell which scons) VERBOSE=1 \
+    cd '$(1)' && scons VERBOSE=1 \
         PATH='$(PATH)' \
         XGCC_W32_PREFIX='$(MXE_TOOL_PREFIX)' \
         PREFIX='$(BUILD_TOOLS_PREFIX)' \