Archives/falk-werner_webfuse
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse synced 2025-06-13 12:54:15 +00:00
Code Issues Releases Wiki Activity

fixes distro selection and parallel mflags

Browse Source
This commit is contained in:
nosamad 2019-04-03 19:47:52 +02:00
parent ee1eb49986
commit 31ec242da5
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Makefile
View File

@ -1,4 +1,4 @@
PARALLELMFLAGS ?= -j$(shell nproc) PARALLELMFLAGS ?= $(addprefix -j,$(shell echo "$$(($(NPROC)/$(TASKS)))"))
MAKEFLAGS += $(PARALLELMFLAGS) --no-builtin-rules MAKEFLAGS += $(PARALLELMFLAGS) --no-builtin-rules
.PHONY: default .PHONY: default
@ -6,14 +6,14 @@ default: all
# Overridable defaults # Overridable defaults
export SOURCE_DATE_EPOCH ?= $(shell $(PROJECT_ROOT)/build/get_source_date_epoch.sh) DOCKER ?= docker
export BUILDTIME ?= $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' --rfc-3339 ns 2>/dev/null | sed -e 's/ /T/')
export DOCKER ?= docker
DOCKER_BUILDKIT ?= DOCKER_BUILDKIT ?=
NPROC ?= $(shell nproc)
VERBOSE ?= VERBOSE ?=
BUILDVERBOSE ?= BUILDVERBOSE ?=
$(MARCH)BUILDTARGET ?= amd64-ubuntu-builder $(MARCH)BUILDTARGET ?= amd64-ubuntu-builder
BUILDTYPE ?= Debug BUILDTYPE ?= Debug
MARCH ?= $(call march,$(BUILDTARGET)) MARCH ?= $(call march,$(BUILDTARGET))
@ -21,10 +21,13 @@ DISTRO ?=
PROJECT_NAME ?= webfuse PROJECT_NAME ?= webfuse
PROJECT_ROOT ?= . PROJECT_ROOT ?= .
VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION)
OUT ?= $(PROJECT_ROOT)/.build OUT ?= $(PROJECT_ROOT)/.build
VERSION ?= $(shell cat $(PROJECT_ROOT)/VERSION)
VERSION := $(VERSION)
UID ?= $(shell id -u) UID ?= $(shell id -u)
UID := $(UID)
CONTAINER_USER ?= user CONTAINER_USER ?= user
CONTAINER_GROUP ?= user CONTAINER_GROUP ?= user
@ -33,15 +36,23 @@ CONTAINER_CGROUP_PARENT ?=
HOST_CONTAINER ?= $(shell $(PROJECT_ROOT)/build/get_container_id.sh) HOST_CONTAINER ?= $(shell $(PROJECT_ROOT)/build/get_container_id.sh)
HOST_CONTAINER := $(HOST_CONTAINER) HOST_CONTAINER := $(HOST_CONTAINER)
UBUNTU_CODENAME ?= bionic
DEBIAN_CODENAME ?= testing-slim
SOURCE_DATE_EPOCH ?= $(shell $(PROJECT_ROOT)/build/get_source_date_epoch.sh)
SOURCE_DATE_EPOCH := $(SOURCE_DATE_EPOCH)
export SOURCE_DATE_EPOCH
BUILDTIME ?= $(shell date -u -d '@$(SOURCE_DATE_EPOCH)' --rfc-3339 ns 2>/dev/null | sed -e 's/ /T/')
BUILDTIME := $(BUILDTIME)
export BUILDTIME
$(HOST_CONTAINER)PORTABLE_WORSPACE ?= $(HOST_CONTAINER)PORTABLE_WORSPACE ?=
CONTAINER_PROJECT_ROOT ?= /workspace/src CONTAINER_PROJECT_ROOT ?= /workspace/src
CONTAINER_OUT ?= /workspace/out CONTAINER_OUT ?= /workspace/out
$(PORTABLE_WORSPACE)CONTAINER_PROJECT_ROOT = $(abspath $(PROJECT_ROOT)) $(PORTABLE_WORSPACE)CONTAINER_PROJECT_ROOT = $(abspath $(PROJECT_ROOT))
$(PORTABLE_WORSPACE)CONTAINER_OUT = $(abspath $(OUT)) $(PORTABLE_WORSPACE)CONTAINER_OUT = $(abspath $(OUT))
UBUNTU_CODENAME ?= bionic
DEBIAN_CODENAME ?= testing-slim
# Dependencies # Dependencies
DUMB_INIT_VERISON ?= 1.2.2 DUMB_INIT_VERISON ?= 1.2.2
@ -159,11 +170,12 @@ RULE_TARGETS += $(addsuffix /rules.mk,$(OUT_TARGETS))
uc = $(shell echo '$1' | sed -e 's/.*/\U&/g') uc = $(shell echo '$1' | sed -e 's/.*/\U&/g')
DISTRO := $(call uc,$(DISTRO)) DISTRO_PREFIX = $(addsuffix _,$(call uc,$(DISTRO)))
MARCHS := $(sort $(MARCHS))
_TARGETS := $(TARGETS) MARCHS := $(sort $(MARCHS))
TARGETS := $(sort $($(DISTRO)_TARGETS)) TARGETS := $(sort $($(DISTRO_PREFIX)TARGETS))
TASKS = $(words $(if $(TARGETS),$(TARGETS),_))
PARALLELMFLAGS := $(PARALLELMFLAGS)
# Macros # Macros
@ -255,26 +267,25 @@ endif
$(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS) $(RULE_TARGETS): $(PROJECT_ROOT)/Makefile | $(OUT_DIRS)
$(SILENT) \ $(SILENT) \
{ \ { \
echo; \ echo '$(call image_rule,$(TARGET))'; \
echo '$(call image_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call configure_rule,$(TARGET))'; \
echo '$(call configure_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call build_rule,$(TARGET))'; \
echo '$(call build_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call check_rule,$(TARGET))'; \
echo '$(call check_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call memcheck_rule,$(TARGET))'; \
echo '$(call memcheck_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call run_rule,$(TARGET))'; \
echo '$(call run_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call clean_rule,$(TARGET))'; \
echo '$(call clean_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call discover_cc_settings_rule,$(TARGET))'; \
echo '$(call discover_cc_settings_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call discover_cc_rule,$(TARGET))'; \
echo '$(call discover_cc_rule,$(TARGET))'; \ echo; \
echo; \ echo '$(call wrapper_rule,$(TARGET))'; \
echo '$(call wrapper_rule,$(TARGET))'; \
} > $@ } > $@
.PHONY: all build-% .PHONY: all build-%