# HG changeset patch # User Drew Fisher # Date 1469472170 25200 # Node ID ac658baf9abba39a3c867cb20656cf0ae6a4d3d2 # Parent 7b42c58b14c1b0daad6d1271331b467db45b17d0 23499922 Docker Engine for Solaris (fix sparc & evaluation builds) diff -r 7b42c58b14c1 -r ac658baf9abb components/docker/Makefile --- a/components/docker/Makefile Mon Jul 25 07:43:36 2016 -0700 +++ b/components/docker/Makefile Mon Jul 25 11:42:50 2016 -0700 @@ -36,13 +36,29 @@ TPNO= 27475 -include $(WS_MAKE_RULES)/prep.mk -include $(WS_MAKE_RULES)/ips.mk +BUILD_STYLE= justmake +# Remove the conditional when BUILD_ARCH is removed above. +ifeq ($(strip $(BUILD_ARCH)),$(MACH)) +BUILD_TARGET= +INSTALL_TARGET= +endif +TEST_TARGET= $(NO_TESTS) -ASLR_MODE = $(ASLR_NOT_APPLICABLE) +# Requires S12-only changes from ON. +ifeq ($(BUILD_TYPE), evaluation) +PUBLISH_STAMP= +endif + +include $(WS_MAKE_RULES)/common.mk + +# Go-based components are not currently compatible with ASLR. +ASLR_MODE= $(ASLR_DISABLE) PKG_PROTO_DIRS += $(COMPONENT_DIR)/files/man +# Remove the conditional when BUILD_ARCH is removed above. +ifeq ($(strip $(BUILD_ARCH)),$(MACH)) +ifneq ($(BUILD_TYPE), evaluation) # common targets build: $(SOURCE_DIR)/.prep cd $(SOURCE_DIR); DOCKER_GITCOMMIT=6f2305e \ @@ -51,8 +67,8 @@ install: FRC $(TOUCH) $(SOURCE_DIR)/.installed - -test: $(NO_TESTS) +endif +endif REQUIRED_PACKAGES += database/sqlite-3 REQUIRED_PACKAGES += system/core-os