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

removes unnecessary configuration elements

Browse Source
This commit is contained in:
nosamad 2019-04-15 21:35:06 +02:00
parent 3cccac6959
commit eb4dcec303
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -76,7 +76,7 @@ $(SKIP_MD5SUM)$(FETCHDIR)/jansson-$(JANSSON_VERSION).tar.gz: MD5 := c4b106528d5f
QEMU_VERSION ?= v3.1.0-2
DOCKER_BUILDARGS += QEMU_VERSION_=$(QEMU_VERSION)
FETCH_TARGETS += $(OUTDIR)/docker/qemu-arm-static-$(QEMU_VERSION)
FETCH_TARGETS += $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION)
$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): URL := https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-arm-static
$(SKIP_MD5SUM)$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): MD5 := 8ebd24e63fdfa07c557d45373bd831b1
@ -84,16 +84,9 @@ $(SKIP_MD5SUM)$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): MD5 := 8ebd24e63fdfa0
# Architecture-specific rule target configuration
CMAKE_TARGETS += amd64-ubuntu-builder
$(OUTDIR)/amd64-ubuntu-builder/cmakerules.mk: TARGET := amd64-ubuntu-builder
CMAKE_TARGETS += amd64-debian-builder
$(OUTDIR)/amd64-debian-builder/cmakerules.mk: TARGET := amd64-debian-builder
CMAKE_TARGETS += arm32v7-ubuntu-builder
$(OUTDIR)/arm32v7-ubuntu-builder/cmakerules.mk: TARGET := arm32v7-ubuntu-builder
CMAKE_TARGETS += arm32v7-debian-builder
$(OUTDIR)/arm32v7-debian-builder/cmakerules.mk: TARGET := arm32v7-debian-builder
MEMCHECK_FILTER = $(call regex_march_distro,'$(HOST_MARCH)','.*')
@ -121,6 +114,7 @@ DOCKER_BUILDARGS += CODENAME=$(CODENAME)
OUTDIRS += $(OUTDIR)/src
EXTRACT_TARGETS += $(OUTDIR)/docker/qemu-arm-static-$(QEMU_VERSION)
EXTRACT_TARGETS += $(patsubst $(FETCHDIR)/%.tar.gz,$(OUTDIR)/src/%,$(FETCH_TARGETS))
#######################################################################################################################
@ -148,15 +142,15 @@ $(UBUNTU_TARGETS): CODENAME := $(UBUNTU_CODENAME)
$(DEBIAN_TARGETS): CODENAME := $(DEBIAN_CODENAME)
$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION):
$(SILENT)$(call curl,$@,$(URL),$(MD5)) && chmod +x $@
$(OUTDIR)/docker/qemu-arm-static-$(QEMU_VERSION) : $(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION) | $(OUTDIRS)
$(SILENT) \
$(call echo_if_silent,cp $< $@) \
&& cp $< $@ \
&& chmod +x $@
$(FETCHDIR)/%.tar.gz: | $(OUTDIRS)
$(FETCH_TARGETS): | $(OUTDIRS)
$(SILENT)$(call curl,$@,$(URL),$(MD5))
$(OUTDIR)/docker/% : $(FETCHDIR)/% | $(OUTDIRS)
cp $< $@
$(OUTDIR)/src/%: $(FETCHDIR)/%.tar.gz | $(OUTDIRS)
$(SILENT) \
$(call echo_if_silent,tar -C $(dir $@) -xf $<) \

24
build/mkdocker/cmake.mk
View File

@ -50,19 +50,20 @@ DOCKER_RUNFLAGS += --env NINJA_STATUS
CMAKEFLAGS += '-GNinja'
CMAKEFLAGS += '-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)'
CMAKE_TARGETS := $(CMAKE_TARGETS)
CMAKE_TARGET := $(filter $(BUILDTARGET),$(CMAKE_TARGETS))
$(CMAKE_TARGET)CMAKE_ACTIVE_TARGETS += $(CMAKE_TARGETS)
CMAKE_ACTIVE_TARGETS += $(CMAKE_TARGET)
CMAKE_TARGETS := $(call filter_targets,$(FILTER),$(CMAKE_ACTIVE_TARGETS))
CMAKE_ACTIVE_TARGETS := $(call filter_targets,$(FILTER),$(CMAKE_ACTIVE_TARGETS))
CMAKE_BUILD_TARGETS += $(addprefix build-,$(CMAKE_TARGETS))
CMAKE_CLEAN_TARGETS += $(addprefix clean-,$(CMAKE_TARGETS))
CMAKE_CHECK_TARGETS += $(addprefix check-,$(CMAKE_TARGETS))
CMAKE_MEMCHECK_TARGETS += $(addprefix memcheck-,$(call filter_targets,$(CMAKE_MEMCHECK_FILTER),$(CMAKE_TARGETS)))
CMAKE_RUN_TARGETS += $(addprefix run-,$(firstword $(CMAKE_TARGETS)))
CMAKE_DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(CMAKE_TARGETS)))
CMAKE_OUTDIRS += $(addsuffix /$(CMAKE_BUILD_TYPE),$(addprefix $(OUTDIR)/,$(CMAKE_TARGETS)))
CMAKE_RULE_TARGETS += $(addsuffix /cmakerules.mk,$(addprefix $(OUTDIR)/,$(CMAKE_TARGETS)))
CMAKE_BUILD_TARGETS += $(addprefix build-,$(CMAKE_ACTIVE_TARGETS))
CMAKE_CLEAN_TARGETS += $(addprefix clean-,$(CMAKE_ACTIVE_TARGETS))
CMAKE_CHECK_TARGETS += $(addprefix check-,$(CMAKE_ACTIVE_TARGETS))
CMAKE_MEMCHECK_TARGETS += $(addprefix memcheck-,$(call filter_targets,$(CMAKE_MEMCHECK_FILTER),$(CMAKE_ACTIVE_TARGETS)))
CMAKE_RUN_TARGETS += $(addprefix run-,$(firstword $(CMAKE_ACTIVE_TARGETS)))
CMAKE_DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(CMAKE_ACTIVE_TARGETS)))
CMAKE_OUTDIRS += $(addsuffix /$(CMAKE_BUILD_TYPE),$(addprefix $(OUTDIR)/,$(CMAKE_ACTIVE_TARGETS)))
CMAKE_RULE_TARGETS += $(addsuffix /cmakerules.mk,$(OUTDIR))
BUILD_TARGETS += $(CMAKE_BUILD_TARGETS)
CHECK_TARGETS += $(CMAKE_CHECK_TARGETS)
@ -71,7 +72,7 @@ CLEAN_TARGETS += $(CMAKE_CLEAN_TARGETS)
RUN_TARGETS += $(CMAKE_RUN_TARGETS)
DISCOVER_CC_TARGETS += $(CMAKE_DISCOVER_CC_TARGETS)
RULE_TARGETS += $(CMAKE_RULE_TARGETS)
TARGETS += $(CMAKE_TARGETS)
TARGETS += $(CMAKE_ACTIVE_TARGETS)
OUTDIRS += $(CMAKE_OUTDIRS)
#######################################################################################################################
@ -86,6 +87,8 @@ MAKEFILE_DEPS += echo
$(CMAKE_RULE_TARGETS):
$(SILENT) \
{ \
$(foreach TARGET,$(CMAKE_TARGETS),\
echo; \
echo '$(call image_rule,$(TARGET))'; \
echo; \
echo '$(call cmake_configure_rule,$(TARGET))'; \
@ -105,5 +108,6 @@ $(CMAKE_RULE_TARGETS):
echo '$(call discover_cc_rule,$(TARGET))'; \
echo; \
echo '$(call wrapper_rule,$(TARGET))'; \
) \
} > $@