1
0
mirror of https://github.com/falk-werner/webfuse synced 2024-10-27 20:34:10 +00:00

adds distro filter and set default to ubuntu for travis

disables debian builds for now
This commit is contained in:
nosamad 2019-04-03 01:26:46 +02:00
parent fc4c7ab29c
commit d617c7f49e
2 changed files with 8 additions and 1 deletions

View File

@ -12,6 +12,7 @@ addons:
- qemu-user-static - qemu-user-static
env: env:
global: global:
- DISTRO=ubuntu
- PARALLELMFLAGS="-j2" - PARALLELMFLAGS="-j2"
- PORTABLE_WORSPACE=1 - PORTABLE_WORSPACE=1
matrix: matrix:

View File

@ -17,6 +17,7 @@ BUILDVERBOSE ?=
$(MARCH)BUILDTARGET ?= amd64-ubuntu-builder $(MARCH)BUILDTARGET ?= amd64-ubuntu-builder
BUILDTYPE ?= Debug BUILDTYPE ?= Debug
MARCH ?= $(call march,$(BUILDTARGET)) MARCH ?= $(call march,$(BUILDTARGET))
DISTRO ?=
PROJECT_NAME ?= webfuse PROJECT_NAME ?= webfuse
PROJECT_ROOT ?= . PROJECT_ROOT ?= .
@ -156,8 +157,13 @@ EXTRACT_TARGETS += $(patsubst $(OUT)/%.tar.gz,$(OUT)/src/%,$(FETCH_TARGETS))
DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(TARGETS))) DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(TARGETS)))
RULE_TARGETS += $(addsuffix /rules.mk,$(OUT_TARGETS)) RULE_TARGETS += $(addsuffix /rules.mk,$(OUT_TARGETS))
uc = $(shell echo '$1' | sed -e 's/.*/\U&/g')
DISTRO := $(call uc,$(DISTRO))
MARCHS := $(sort $(MARCHS)) MARCHS := $(sort $(MARCHS))
TARGETS := $(sort $(TARGETS))
_TARGETS := $(TARGETS)
TARGETS := $(sort $($(DISTRO)_TARGETS))
# Macros # Macros