limit parallel make load (issue #131)

This commit is contained in:
Trammell Hudson 2017-03-21 14:29:07 -04:00
parent 2befac7e13
commit db3a8e8c2e
Failed to extract signature
12 changed files with 15 additions and 13 deletions

View File

@ -5,7 +5,7 @@ build := $(pwd)/build
config := $(pwd)/build config := $(pwd)/build
INSTALL := $(pwd)/install INSTALL := $(pwd)/install
log_dir := $(build)/log log_dir := $(build)/log
MAKE_JOB ?= 8 MAKE_JOBS ?= -j8 --max-load 24
# Create the log directory if it doesn't already exist # Create the log directory if it doesn't already exist
BUILD_LOG := $(shell [ -d "$(log_dir)" ] || mkdir "$(log_dir)") BUILD_LOG := $(shell [ -d "$(log_dir)" ] || mkdir "$(log_dir)")
@ -38,7 +38,7 @@ heads_cc := $(INSTALL)/bin/musl-gcc \
-fdebug-prefix-map=$(pwd)=heads \ -fdebug-prefix-map=$(pwd)=heads \
-gno-record-gcc-switches \ -gno-record-gcc-switches \
CROSS := $(build)/$(musl-cross_dir)/../../crossgcc/x86_64-linux-musl/bin/x86_64-musl-linux- CROSS := $(build)/../crossgcc/x86_64-linux-musl/bin/x86_64-musl-linux-
#heads_cc := $(HOME)/install/x86_64-linux-musl/x86_64-linux-musl/bin/gcc #heads_cc := $(HOME)/install/x86_64-linux-musl/x86_64-linux-musl/bin/gcc
@ -229,7 +229,7 @@ initrd/bin/busybox: $(build)/$(busybox_dir)/busybox
-C $(build)/$(busybox_dir) \ -C $(build)/$(busybox_dir) \
CC="$(heads_cc)" \ CC="$(heads_cc)" \
CONFIG_PREFIX="$(pwd)/initrd" \ CONFIG_PREFIX="$(pwd)/initrd" \
-j 8 \ $(MAKE_JOBS) \
install install
# hack to build cbmem from coreboot # hack to build cbmem from coreboot
@ -353,7 +353,7 @@ all:
# How to download and build the correct version of make # How to download and build the correct version of make
$(HEADS_MAKE): $(build)/$(make_dir)/Makefile $(HEADS_MAKE): $(build)/$(make_dir)/Makefile
make -C "`dirname $@`" -j$(MAKE_JOBS) \ make -C "`dirname $@`" $(MAKE_JOBS) \
2>&1 \ 2>&1 \
| tee "$(log_dir)/make.log" \ | tee "$(log_dir)/make.log" \
$(VERBOSE_REDIRECT) $(VERBOSE_REDIRECT)

View File

@ -12,7 +12,7 @@ busybox_output := busybox
busybox_target := \ busybox_target := \
CC="$(heads_cc)" \ CC="$(heads_cc)" \
CONFIG_PREFIX="$(INSTALL)" \ CONFIG_PREFIX="$(INSTALL)" \
-j $(MAKE_JOBS) \ $(MAKE_JOBS) \
install install
busybox_depends := $(musl_dep) busybox_depends := $(musl_dep)

View File

@ -30,7 +30,7 @@ coreboot_target := \
BUILD_TIMELESS=1 \ BUILD_TIMELESS=1 \
CFLAGS_x86_32="$(EXTRA_FLAGS)" \ CFLAGS_x86_32="$(EXTRA_FLAGS)" \
CFLAGS_x86_64="$(EXTRA_FLAGS)" \ CFLAGS_x86_64="$(EXTRA_FLAGS)" \
-j $(MAKE_JOBS) $(MAKE_JOBS)
coreboot_output := $(BOARD)/coreboot.rom coreboot_output := $(BOARD)/coreboot.rom

View File

@ -20,7 +20,7 @@ cryptsetup_configure := ./configure \
# but after building, replace prefix so that they will be installed # but after building, replace prefix so that they will be installed
# in the correct directory. # in the correct directory.
cryptsetup_target := \ cryptsetup_target := \
-j $(MAKE_JOBS) \ $(MAKE_JOBS) \
&& $(MAKE) \ && $(MAKE) \
-C $(build)/$(cryptsetup_dir) \ -C $(build)/$(cryptsetup_dir) \
prefix="$(INSTALL)" \ prefix="$(INSTALL)" \

View File

@ -17,6 +17,7 @@ kexec_configure := ./configure \
&& $(MAKE) clean && $(MAKE) clean
kexec_target := \ kexec_target := \
$(MAKE_JOBS) \
install \ install \
kexec_output := build/sbin/kexec kexec_output := build/sbin/kexec

View File

@ -11,7 +11,7 @@ libuuid_configure := ./configure \
--prefix "" \ --prefix "" \
--host i386-elf-linux \ --host i386-elf-linux \
libuuid_target := -j $(MAKE_JOBS) && \ libuuid_target := $(MAKE_JOBS) && \
$(MAKE) \ $(MAKE) \
-C "$(build)/$(libuuid_dir)" \ -C "$(build)/$(libuuid_dir)" \
prefix="$(INSTALL)" \ prefix="$(INSTALL)" \

View File

@ -22,6 +22,7 @@ lvm2_configure := \
# not sure why LIB_SUFFIX is not defined in the cross build # not sure why LIB_SUFFIX is not defined in the cross build
lvm2_target := \ lvm2_target := \
$(MAKE_JOBS) \
install_device-mapper \ install_device-mapper \
#lvm2_libraries := libdm/libdevmapper.so #lvm2_libraries := libdm/libdevmapper.so

View File

@ -14,7 +14,7 @@ mbedtls_target := \
SHARED=1 \ SHARED=1 \
DESTDIR=$(INSTALL) \ DESTDIR=$(INSTALL) \
CC="$(heads_cc)" \ CC="$(heads_cc)" \
-j $(MAKE_JOBS) \ $(MAKE_JOBS) \
install install
mbedtls_depends := $(musl_dep) mbedtls_depends := $(musl_dep)

View File

@ -24,7 +24,7 @@ musl_configure := ./configure \
musl_target := -j $(MAKE_JOBS) install musl_target := $(MAKE_JOBS) install
#musl_target := install #musl_target := install
musl_depends := kernel-headers musl-cross musl_depends := kernel-headers musl-cross

View File

@ -11,7 +11,7 @@ popt_configure := ./configure \
--prefix "" \ --prefix "" \
--host i386-elf-linux \ --host i386-elf-linux \
popt_target := -j $(MAKE_JOBS) \ popt_target := $(MAKE_JOBS) \
&& $(MAKE) \ && $(MAKE) \
-C "$(build)/$(popt_dir)" \ -C "$(build)/$(popt_dir)" \
prefix="$(INSTALL)" \ prefix="$(INSTALL)" \

View File

@ -14,7 +14,7 @@ qrencode_configure := ./configure \
--without-tools \ --without-tools \
--host i386-elf-linux \ --host i386-elf-linux \
qrencode_target := -j $(MAKE_JOBS) \ qrencode_target := $(MAKE_JOBS) \
&& $(MAKE) \ && $(MAKE) \
-C "$(build)/$(qrencode_dir)" \ -C "$(build)/$(qrencode_dir)" \
prefix="$(INSTALL)" \ prefix="$(INSTALL)" \

View File

@ -10,4 +10,4 @@ xen_hash := 02badfce9a037bd1bd4a94210c1f6b85467746216c71795805102b514bcf1fc4
xen_output := xen.gz xen_output := xen.gz
xen_configure := xen_configure :=
xen_target := -j $(MAKE_JOBS) xen_target := $(MAKE_JOBS)