diff options
| author |   Tom Jones <thj@freebsd.org> | 2024-02-07 13:17:17 +0000 |
|---|---|---|
| committer |   Damjan Marion <dmarion@0xa5.net> | 2024-03-26 15:09:39 +0000 |
| commit | 26eec75f2b30f4c03b4ca671165cd0d4823f0175 (patch) | |
| tree | 97f2260489d8d76a89f61c7de64e4e0eb4f76dd0 | |
| parent | b10561bbecb2870360a731b4696bff920150720d (diff) | |
build: Detect number of CPUs for build processes on FreeBSD
Type: improvement
Change-Id: Ia3a00266f47f0c3e567efa143ef08bf4e8cffe35
Signed-off-by: Tom Jones <thj@freebsd.org>
| -rw-r--r-- | build-root/Makefile | 7 | ||||
| -rw-r--r-- | build/external/Makefile | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build-root/Makefile b/build-root/Makefile index 68d295e6808..d69a94c1e41 100644 --- a/build-root/Makefile +++ b/build-root/Makefile @@ -650,11 +650,18 @@ configure_check_timestamp = \ # /proc/cpuinfo does not exist on platforms without a /proc and on some # platforms, notably inside containers, it has no content. In those cases # we assume there's 1 processor; we use 2*ncpu for the -j option. +# +# On FreeBSD we can call nproc to get the number of processors. +# # NB: GNU Make 4.2 will let us use '$(file </proc/cpuinfo)' to both test # for file presence and content; for now this will have to do. ifndef MAKE_PARALLEL_JOBS +ifeq ($(shell uname), FreeBSD) +MAKE_PARALLEL_JOBS = $(shell nproc) +else MAKE_PARALLEL_JOBS = $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo), \ $(shell grep -c ^processor /proc/cpuinfo), 2) +endif # FreeBSD endif MAKE_PARALLEL_FLAGS ?= $(if $($(PACKAGE)_make_parallel_fails),,-j $(MAKE_PARALLEL_JOBS)) diff --git a/build/external/Makefile b/build/external/Makefile index c5e6f634dd7..046dd7484ae 100644 --- a/build/external/Makefile +++ b/build/external/Makefile @@ -21,8 +21,12 @@ INSTALL_DIR ?= $(CURDIR)/_install PKG_VERSION ?= $(shell git describe --abbrev=0 --match 'v[0-9]*' | cut -d- -f1 | cut -dv -f2 | cut -d. -f1,2) PKG_SUFFIX ?= $(shell git log --oneline v$(PKG_VERSION)-rc0.. . | wc -l) SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct .) +ifeq ($shell(uname), FreeBSD) +JOBS := $(shell nproc) +else JOBS := $(if $(shell [ -f /proc/cpuinfo ] && head /proc/cpuinfo),\ $(shell grep -c ^processor /proc/cpuinfo), 2) +endif # FreeBSD B := $(BUILD_DIR) I := $(INSTALL_DIR) |