Default XZ_THREADS=0, and add to RELEASE_RMAKEFLAGS

so it is passed to the 'release' make(1) target if
it needs to be adjusted to a non-zero integer.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2015-02-20 18:51:52 +00:00
parent a79d18b7d5
commit 1db297199a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=279074
2 changed files with 5 additions and 1 deletions

View file

@ -53,6 +53,9 @@ PORTBRANCH="ports/head@rHEAD"
#WITH_DVD=
#WITH_COMPRESSED_IMAGES=
## Set to '1' to disable multi-threaded xz(1) compression.
#XZ_THREADS=0
## Set when building embedded images.
#EMBEDDEDBUILD=

View file

@ -93,6 +93,7 @@ WITH_COMPRESSED_IMAGES=
# the release.
WITH_VMIMAGES=
WITH_COMPRESSED_VMIMAGES=
XZ_THREADS=0
# Set to non-empty value to build virtual machine images for various
# cloud providers as part of the release.
@ -179,7 +180,7 @@ RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
${DOCPORTS} WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
WITH_CLOUDWARE=${WITH_CLOUDWARE}"
WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
# Force src checkout if configured
FORCE_SRC_KEY=