Mercurial > mxe-octave

changeset 5900:504476481baf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove build rule for python2. All packages are built with python3 now. It's time to remove deprecated python2. * src/build-python.mk: Remove file. * Makefile.in, dist-files.mk, index.html: Remove references to build rule.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 23 Sep 2021 18:23:22 +0200
parents ef9c181c46a7
children f062bdb4f0a3
files Makefile.in dist-files.mk index.html src/build-python.mk
diffstat 4 files changed, 2 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Thu Sep 23 18:24:24 2021 +0200
+++ b/Makefile.in	Thu Sep 23 18:23:22 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-python build-octave build-setuptools build-scons
+  build-python3 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)
@@ -295,7 +295,7 @@
   REQUIREMENTS += makeinfo xz
   BUILD_TOOLS := $(filter-out build-texinfo build-xz, $(BUILD_TOOLS))
 endif
-# use the a native python in native mingw
+# use a native python in native mingw
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
   REQUIREMENTS += python3
   BUILD_TOOLS := $(filter-out build-python3, $(BUILD_TOOLS))
--- a/dist-files.mk	Thu Sep 23 18:24:24 2021 +0200
+++ b/dist-files.mk	Thu Sep 23 18:23:22 2021 +0200
@@ -44,7 +44,6 @@
   build-perl.mk \
   build-pkg-config-1-fixes.patch \
   build-pkg-config.mk \
-  build-python.mk \
   build-python3.mk \
   build-scons.mk \
   build-sed.mk \
--- a/index.html	Thu Sep 23 18:24:24 2021 +0200
+++ b/index.html	Thu Sep 23 18:23:22 2021 +0200
@@ -1066,10 +1066,6 @@
         <td class="website"><a href="http://www.freedesktop.org/wiki/Software/pkg-config">pkg-config</a></td>
     </tr>
     <tr>
-        <td class="package">build-python</td>
-        <td class="website"><a href="https://www.python.org/dev/peps/pep-0373/">python2</a></td>
-    </tr>
-    <tr>
         <td class="package">build-python3</td>
         <td class="website"><a href="http://www.python.org">python3</a></td>
     </tr>
--- a/src/build-python.mk	Thu Sep 23 18:24:24 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-# This file is part of MXE.
-# See index.html for further information.
-
-PKG             := build-python
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.7.15
-$(PKG)_CHECKSUM := f99348a095ec4a6411c84c0d15343d11920c9724
-$(PKG)_SUBDIR   := Python-$($(PKG)_VERSION)
-$(PKG)_FILE     := Python-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := http://www.python.org/ftp/python/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := 
-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' && '$(1)/configure' \
-        --prefix='$(BUILD_TOOLS_PREFIX)'
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install
-endef