Mercurial > mxe-octave
changeset 5540:13628d1d41e2
Make more build tools optional.
* Makefile.in: Add build tools that are only needed for mesa to optional build
tools (build-mako, build-markupsafe, build-meson, build-ninja, build-python3).
That way they are only built if mesa is built. Same for build-python,
build-scons, and build-setuptools which are only needed when building nsis.
* src/mesa.mk: Add build-ninja to dependencies.
* src/build-mako.mk, src/build-markupsafe.mk: Remove build-setuptools from
dependencies.
* src/nsis.mk: Add build-python and build-setuptools to dependencies.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 19 Sep 2020 17:35:15 +0200 |
| parents | fa6fca3c12d7 |
| children | d862fd40cc42 |
| files | Makefile.in src/build-mako.mk src/build-markupsafe.mk src/mesa.mk src/nsis.mk |
| diffstat | 5 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sat Sep 19 10:17:43 2020 -0400 +++ b/Makefile.in Sat Sep 19 17:35:15 2020 +0200 @@ -263,8 +263,12 @@ BUILD_COMPILER_TOOLS := build-gcc build-binutils BUILD_TOOLS := $(ALL_BUILD_TOOLS) -# build-octave is added as an explicit dependency in the of- packages that need it -BUILD_TOOLS := $(filter-out build-octave, $(BUILD_TOOLS)) +# some build tools are optional and added as explicit dependencies +# to packages that need them +BUILD_TOOLS_OPT := \ + build-mako build-markupsafe build-meson build-ninja build-python3 \ + 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) REQUIREMENTS += flex @@ -315,7 +319,7 @@ TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1) MAKEFILE := $(TOP_BUILD_DIR)/Makefile PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html')) -PKGS += build-octave +PKGS += $(BUILD_TOOLS_OPT) ENV_PATH := $(PATH) PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
--- a/src/build-mako.mk Sat Sep 19 10:17:43 2020 -0400 +++ b/src/build-mako.mk Sat Sep 19 17:35:15 2020 +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 build-setuptools +$(PKG)_DEPS := build-python3 build-markupsafe define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/build-markupsafe.mk Sat Sep 19 10:17:43 2020 -0400 +++ b/src/build-markupsafe.mk Sat Sep 19 17:35:15 2020 +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 build-setuptools +$(PKG)_DEPS := build-python3 define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/mesa.mk Sat Sep 19 10:17:43 2020 -0400 +++ b/src/mesa.mk Sat Sep 19 17:35:15 2020 +0200 @@ -7,7 +7,7 @@ $(PKG)_SUBDIR := mesa-$($(PKG)_VERSION) $(PKG)_FILE := mesa-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.freedesktop.org/pub/mesa/$($(PKG)_FILE) -$(PKG)_DEPS := build-mako build-meson expat zlib llvm s2tc +$(PKG)_DEPS := build-mako build-meson build-ninja expat zlib llvm s2tc define $(PKG)_UPDATE echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2;
--- a/src/nsis.mk Sat Sep 19 10:17:43 2020 -0400 +++ b/src/nsis.mk Sat Sep 19 17:35:15 2020 +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-scons +$(PKG)_DEPS := build-python build-scons build-setuptools define $(PKG)_UPDATE $(WGET) -q -O- 'https://nsis.sourceforge.io/Download' | \