Mercurial > mxe-octave

changeset 5901:f062bdb4f0a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename build-python3 to build-python. Also rename makefile variable PYTHON3 to MXE_PYTHON. Change all references.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 25 Sep 2021 10:54:03 +0200
parents 504476481baf
children 44fb1c07a506
files Makefile.in dist-files.mk index.html src/build-mako.mk src/build-markupsafe.mk src/build-meson.mk src/build-python.mk src/build-python3.mk src/build-scons.mk src/build-setuptools.mk src/llvm.mk src/xcb-proto.mk src/xcb.mk
diffstat 13 files changed, 57 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Thu Sep 23 18:23:22 2021 +0200
+++ b/Makefile.in	Sat Sep 25 10:54:03 2021 +0200
@@ -272,7 +272,7 @@
 # to packages that need them
 BUILD_TOOLS_OPT := \
   build-libffi build-mako build-markupsafe build-meson build-ninja \
-  build-python3 build-octave build-setuptools build-scons
+  build-python build-octave build-setuptools build-scons
 BUILD_TOOLS := $(filter-out $(BUILD_TOOLS_OPT), $(BUILD_TOOLS))
 # Building flex for native mingw fails, so disable it.
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
@@ -298,9 +298,9 @@
 # use a native python in native mingw
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
   REQUIREMENTS += python3
-  BUILD_TOOLS := $(filter-out build-python3, $(BUILD_TOOLS))
+  BUILD_TOOLS := $(filter-out build-python, $(BUILD_TOOLS))
 endif
-PYTHON3 ?= python3
+MXE_PYTHON ?= python3
 
 # use the a native awk in native mingw
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
--- a/dist-files.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/dist-files.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -44,7 +44,7 @@
   build-perl.mk \
   build-pkg-config-1-fixes.patch \
   build-pkg-config.mk \
-  build-python3.mk \
+  build-python.mk \
   build-scons.mk \
   build-sed.mk \
   build-setuptools.mk \
--- a/index.html	Thu Sep 23 18:23:22 2021 +0200
+++ b/index.html	Sat Sep 25 10:54:03 2021 +0200
@@ -1066,8 +1066,8 @@
         <td class="website"><a href="http://www.freedesktop.org/wiki/Software/pkg-config">pkg-config</a></td>
     </tr>
     <tr>
-        <td class="package">build-python3</td>
-        <td class="website"><a href="http://www.python.org">python3</a></td>
+        <td class="package">build-python</td>
+        <td class="website"><a href="http://www.python.org">python</a></td>
     </tr>
     <tr>
         <td class="package">build-scons</td>
--- a/src/build-mako.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/build-mako.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := Mako-$($(PKG)_VERSION)
 $(PKG)_FILE     := Mako-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://pypi.python.org/packages/eb/f3/67579bb486517c0d49547f9697e36582cd19dafb5df9e687ed8e22de57fa/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3 build-markupsafe
+$(PKG)_DEPS     := build-python build-markupsafe
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,5 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
--- a/src/build-markupsafe.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/build-markupsafe.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := MarkupSafe-$($(PKG)_VERSION)
 $(PKG)_FILE     := MarkupSafe-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3
+$(PKG)_DEPS     := build-python
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,6 +16,6 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
 
--- a/src/build-meson.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/build-meson.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := meson-$($(PKG)_VERSION)
 $(PKG)_FILE     := meson-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/mesonbuild/meson/archive/$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := build-python3
+$(PKG)_DEPS     := build-python
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -29,7 +29,7 @@
 endif
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
     
     # create file with compilation settings
     rm -f $(MESON_TOOLCHAIN_FILE) && mkdir -p '$(dir $(MESON_TOOLCHAIN_FILE))'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/build-python.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -0,0 +1,36 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := build-python
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.8.3
+$(PKG)_CHECKSUM := 3bafa40df1cd069c112761c388a9f2e94b5d33dd
+$(PKG)_SUBDIR   := Python-$($(PKG)_VERSION)
+$(PKG)_FILE     := Python-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
+
+## For now, assume that libffi is installed on the build system.
+$(PKG)_DEPS     := # build-libffi
+ifneq ($(USE_SYSTEM_GCC),yes)
+  $(PKG)_DEPS     += build-gcc
+endif
+
+define $(PKG)_UPDATE
+  echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
+  echo $($(PKG)_VERSION)
+endef
+
+define $(PKG)_BUILD
+  mkdir '$(1)/.build'
+  cd '$(1)/.build' && \
+    PKG_CONFIG_PATH='$(BUILD_PKG_CONFIG_PATH)' \
+    LD_LIBRARY_PATH='$(LD_LIBRARY_PATH)' \
+    '$(1)/configure' \
+      --prefix='$(BUILD_TOOLS_PREFIX)'
+
+  $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
+  $(MAKE) -C '$(1)/.build' -j 1 install
+
+  # install python3 as python
+  ln -sf '$(BUILD_TOOLS_PREFIX)/bin/python3' '$(BUILD_TOOLS_PREFIX)/bin/python'
+endef
--- a/src/build-python3.mk	Thu Sep 23 18:23:22 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := build-python3
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8.3
-$(PKG)_CHECKSUM := 3bafa40df1cd069c112761c388a9f2e94b5d33dd
-$(PKG)_SUBDIR   := Python-$($(PKG)_VERSION)
-$(PKG)_FILE     := Python-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
-
-## For now, assume that libffi is installed on the build system.
-$(PKG)_DEPS     := # build-libffi
-ifneq ($(USE_SYSTEM_GCC),yes)
-  $(PKG)_DEPS     += build-gcc
-endif
-
-define $(PKG)_UPDATE
-  echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
-  echo $($(PKG)_VERSION)
-endef
-
-define $(PKG)_BUILD
-  mkdir '$(1)/.build'
-  cd '$(1)/.build' && \
-    PKG_CONFIG_PATH='$(BUILD_PKG_CONFIG_PATH)' \
-    LD_LIBRARY_PATH='$(LD_LIBRARY_PATH)' \
-    '$(1)/configure' \
-      --prefix='$(BUILD_TOOLS_PREFIX)'
-
-  $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
-  $(MAKE) -C '$(1)/.build' -j 1 install
-
-  # install python3 as python
-  ln -sf '$(BUILD_TOOLS_PREFIX)/bin/python3' '$(BUILD_TOOLS_PREFIX)/bin/python'
-endef
--- a/src/build-scons.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/build-scons.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := SCons-$($(PKG)_VERSION)
 $(PKG)_FILE     := scons-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://sourceforge.net/projects/scons/files/scons/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3
+$(PKG)_DEPS     := build-python
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- https://sourceforge.net/projects/scons/files/scons/ | \
@@ -17,5 +17,5 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
--- a/src/build-setuptools.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/build-setuptools.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := setuptools-$($(PKG)_VERSION)
 $(PKG)_FILE     := setuptools-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://files.pythonhosted.org/packages/fc/0a/b486efab52f8ad03c3eca0c998dd3deafba0c39b29e0c49c68a7152c8b2d/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3
+$(PKG)_DEPS     := build-python
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
@@ -16,5 +16,5 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && $(PYTHON3) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
+    cd '$(1)' && $(MXE_PYTHON) setup.py install --prefix='$(BUILD_TOOLS_PREFIX)'
 endef
--- a/src/llvm.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/llvm.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := llvm-$($(PKG)_VERSION).src
 $(PKG)_FILE     := llvm-$($(PKG)_VERSION).src.tar.xz
 $(PKG)_URL      := https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-cmake build-ninja build-python3
+$(PKG)_DEPS     := build-cmake build-ninja build-python
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://releases.llvm.org/download.html?' | \
--- a/src/xcb-proto.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/xcb-proto.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.x.org/archive/individual/xcb/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3
+$(PKG)_DEPS     := build-python
 
 
 define $(PKG)_UPDATE
@@ -24,7 +24,7 @@
 else
   define $(PKG)_BUILD
     mkdir '$(1)/.build'
-    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) PYTHON=$(PYTHON3) '$(1)/configure' \
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) PYTHON=$(MXE_PYTHON) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \
--- a/src/xcb.mk	Thu Sep 23 18:23:22 2021 +0200
+++ b/src/xcb.mk	Sat Sep 25 10:54:03 2021 +0200
@@ -8,7 +8,7 @@
 $(PKG)_SUBDIR   := libxcb-$($(PKG)_VERSION)
 $(PKG)_FILE     := libxcb-$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://www.x.org/archive/individual/xcb/$($(PKG)_FILE)
-$(PKG)_DEPS     := build-python3 pthread-stubs util-macros xau xcb-proto
+$(PKG)_DEPS     := build-python pthread-stubs util-macros xau xcb-proto
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'https://www.x.org/archive/individual/xcb/' | \
@@ -23,7 +23,7 @@
 else
   define $(PKG)_BUILD
     mkdir '$(1)/.build'
-    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) PYTHON=$(PYTHON3) '$(1)/configure' \
+    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) PYTHON=$(MXE_PYTHON) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)' \