# HG changeset patch # User John Beck # Date 1463445061 25200 # Node ID 4c61ee2c9e6dd67e618597193346d642d1324fae # Parent e7eb980cf5b40d3334f5ad60182d66290f12efb0 23294024 do not publish gtk2 when BUILD_TYPE=evaluation diff -r e7eb980cf5b4 -r 4c61ee2c9e6d components/gnome/gtk2/Makefile --- a/components/gnome/gtk2/Makefile Mon May 16 17:30:22 2016 -0700 +++ b/components/gnome/gtk2/Makefile Mon May 16 17:31:01 2016 -0700 @@ -40,6 +40,13 @@ TPNO= 24778 +# Requires gdk-pixbuf, which we cannot build on 11.3, so do not publish. +ifeq ($(BUILD_TYPE), evaluation) +BUILD_32_and_64= +INSTALL_32_and_64= +PUBLISH_STAMP= +endif + ETCDIR.64="$(ETCDIR)/$(MACH64)" include $(WS_MAKE_RULES)/gnome-component.mk @@ -65,6 +72,7 @@ # Tell g-ir-scanner which compiler to use since upstream Makefile forgot to COMPONENT_BUILD_ENV += INTROSPECTION_SCANNER_ENV='CC=$(CC_FOR_BUILD)' +ifneq ($(BUILD_TYPE), evaluation) # Generate and install architecture-specific configuration files. PROTOETCGTKDIR.32= $(PROTO_DIR)/$(ETCDIR.32)/gtk-2.0 PROTOETCGTKDIR.64= $(PROTO_DIR)/$(ETCDIR.64)/gtk-2.0 @@ -86,6 +94,7 @@ $(GSED) -e "s#$(PROTO_DIR)/##" > $(PROTOETCIMMCONF.64) install: $(PROTOETCIMMCONF.32) $(PROTOETCIMMCONF.64) +endif # Needed for "gmake test" to work successfully. unexport SHELLOPTS