# HG changeset patch # User John Beck # Date 1467840722 25200 # Node ID 2499cc045aa13ef5095ff550af293e899f8d322e # Parent 8dc598b3e3c3eea93fd9519bd8e04b7cc575551a 23750399 do not publish pinentry when BUILD_TYPE=evaluation diff -r 8dc598b3e3c3 -r 2499cc045aa1 components/pinentry/Makefile --- a/components/pinentry/Makefile Fri Jul 08 02:58:33 2016 -0700 +++ b/components/pinentry/Makefile Wed Jul 06 14:32:02 2016 -0700 @@ -38,6 +38,13 @@ TPNO= 26271 +# Requires updated version of gtk2, not available on S11. +ifeq ($(BUILD_TYPE), evaluation) +BUILD_64= +INSTALL_64= +PUBLISH_STAMP= +endif + INSTALL_TARGET= TEST_TARGET= $(NO_TESTS) include $(WS_MAKE_RULES)/common.mk @@ -87,12 +94,14 @@ CONFIGURE_OPTIONS += --disable-libsecret install: $(INSTALL_64) +ifneq ($(BUILD_TYPE), evaluation) $(MKDIR) $(PROTOUSRLIBDIR) if test -f $(PROTOUSRBINDIR)/pinentry-curses ; then \ $(MV) $(PROTOUSRBINDIR)/pinentry-curses $(PROTOUSRLIBDIR)/ ; fi if test -f $(PROTOUSRBINDIR)/pinentry-gtk-2 ; then \ $(MV) $(PROTOUSRBINDIR)/pinentry-gtk-2 $(PROTOUSRLIBDIR)/ ; fi cd $(PROTOUSRLIBDIR) && ln -sf pinentry-gtk-2 pinentry +endif REQUIRED_PACKAGES += library/desktop/gtk2 REQUIRED_PACKAGES += library/glib2