Mercurial > mxe-octave

comparison Makefile.in @ 5540:13628d1d41e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 eae508c12529
children d862fd40cc42
comparison
equal deleted inserted replaced
5539:fa6fca3c12d7 5540:13628d1d41e2
261 ## generate output that runs on the host system (TARGET in MXE terms). 261 ## generate output that runs on the host system (TARGET in MXE terms).
262 ALL_BUILD_TOOLS := $(shell $(SED) -n 's/^.* class="package">\(build-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html') 262 ALL_BUILD_TOOLS := $(shell $(SED) -n 's/^.* class="package">\(build-[^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html')
263 263
264 BUILD_COMPILER_TOOLS := build-gcc build-binutils 264 BUILD_COMPILER_TOOLS := build-gcc build-binutils
265 BUILD_TOOLS := $(ALL_BUILD_TOOLS) 265 BUILD_TOOLS := $(ALL_BUILD_TOOLS)
266 # build-octave is added as an explicit dependency in the of- packages that need it 266 # some build tools are optional and added as explicit dependencies
267 BUILD_TOOLS := $(filter-out build-octave, $(BUILD_TOOLS)) 267 # to packages that need them
268 BUILD_TOOLS_OPT := \
269 build-mako build-markupsafe build-meson build-ninja build-python3 \
270 build-python build-octave build-setuptools build-scons
271 BUILD_TOOLS := $(filter-out $(BUILD_TOOLS_OPT), $(BUILD_TOOLS))
268 # Building flex for native mingw fails, so disable it. 272 # Building flex for native mingw fails, so disable it.
269 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes) 273 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
270 REQUIREMENTS += flex 274 REQUIREMENTS += flex
271 BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS)) 275 BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS))
272 endif 276 endif
313 TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) 317 TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
314 PKG_DIR := @PKG_DIR@ 318 PKG_DIR := @PKG_DIR@
315 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1) 319 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1)
316 MAKEFILE := $(TOP_BUILD_DIR)/Makefile 320 MAKEFILE := $(TOP_BUILD_DIR)/Makefile
317 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html')) 321 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html'))
318 PKGS += build-octave 322 PKGS += $(BUILD_TOOLS_OPT)
319 323
320 ENV_PATH := $(PATH) 324 ENV_PATH := $(PATH)
321 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH) 325 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
322 ifeq ($(USE_CCACHE),yes) 326 ifeq ($(USE_CCACHE),yes)
323 PATH := $(BUILD_TOOLS_PREFIX)/bin/ccache:$(PATH) 327 PATH := $(BUILD_TOOLS_PREFIX)/bin/ccache:$(PATH)