Mercurial > mxe-octave
diff src/mesa.mk @ 5495:fb50ae69121c
Add build rule for python3 (bug #58689).
* src/build-python3.mk: Add build rule for python3 version 3.8.3.
* dist-files.mk: Add new file to list.
* index.html: Add new package to list.
* src/build-setuptools.mk: Update to version 44.1.1 (last version compatible
with python2). Use python2. Set installation prefix.
* src/build-mako.mk: Use python2. Set installation prefix.
* src/build-markupsafe.mk: Use python2. Set installation prefix.
* src/mesa.mk: Windows rule depends on scons. Use python2.
* src/nsis.mk: Depend on scons. Use python2.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 05 Jul 2020 12:21:53 +0200 |
| parents | 7f42b41d6021 |
| children | be0a7ce498e6 |
line wrap: on
line diff
--- a/src/mesa.mk Sat Jul 04 12:14:29 2020 -0400 +++ b/src/mesa.mk Sun Jul 05 12:21:53 2020 +0200 @@ -11,6 +11,7 @@ $(PKG)_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH) ifeq ($(MXE_WINDOWS_BUILD),yes) + $(PKG)_DEPS += build-scons ifeq ($(USE_SYSTEM_OPENGL),no) $(PKG)_SCONS_OPENGL_OPTIONS := libgl-gdi endif @@ -48,7 +49,7 @@ $(PKG)_MACHINE := x86 endif define $(PKG)_BUILD - cd '$(1)' && LLVM=$(HOST_PREFIX) scons platform=windows toolchain=crossmingw machine=$($(PKG)_MACHINE) verbose=1 build=release $($(PKG)_SCONS_OPENGL_OPTIONS) + cd '$(1)' && LLVM=$(HOST_PREFIX) python2 $(shell which scons) platform=windows toolchain=crossmingw machine=$($(PKG)_MACHINE) verbose=1 build=release $($(PKG)_SCONS_OPENGL_OPTIONS) ## Do the scons config files have useful install targets? $(INSTALL) -d '$(3)$(HOST_INCDIR)/GL';