--- a/components/gzip/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/gzip/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -18,33 +18,27 @@
#
# CDDL HEADER END
#
+
+#
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
+BUILD_BITS= 64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= gzip
COMPONENT_VERSION= 1.6
-COMPONENT_PROJECT_URL= http://www.gnu.org/software/gzip/
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:97eb83b763d9e5ad35f351fe5517e6b71521d7aac7acf3e3cacdb6b1496d8f7e
-COMPONENT_ARCHIVE_URL= ftp://ftp.gnu.org/gnu/gzip/$(COMPONENT_ARCHIVE)
-COMPONENT_BUGDB= utility/gzip
TPNO= 27439
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+INSTALL_TARGET=
+SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64)
+include $(WS_MAKE_RULES)/gnu-component.mk
-# To get correct @bindir@ substitution in the various gz<whatever> scripts.
-CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin
-
-# Prevent gzip compilation using assembly code, which segv's with Studio 12.3.
+# Prevent gzip assembly code usage; which segv's with Studio 12.3 and 12.4.
CONFIGURE_OPTIONS += gzip_cv_assembler=no
CONFIGURE_OPTIONS += --infodir=$(CONFIGURE_INFODIR)
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
# Needed for "gmake test" to work successfully.
# If SHELLOPTS is exported (as it is by the userland makefiles),
@@ -83,30 +77,18 @@
$(RM) $@; echo ".so man1/gzgrep.1" > $@
# Get the binaries to test from the component build area.
-COMPONENT_TEST_ENV += PATH=$(BUILD_DIR_$(BITS)):/usr/xpg4/bin:/usr/bin
+COMPONENT_TEST_ENV += PATH=$(BUILD_DIR_$(BITS)):/usr/xpg4/bin:$(USRBINDIR)
# Use the installed gzip binary from /usr/bin.
-COMPONENT_SYSTEM_TEST_ENV += PATH=/usr/xpg4/bin:/usr/bin
+COMPONENT_SYSTEM_TEST_ENV += PATH=/usr/xpg4/bin:$(USRBINDIR)
COMPONENT_TEST_TRANSFORMS += \
'-n ' \
'-e "/PASS/p" ' \
'-e "/FAIL/p" '
-ASLR_MODE = $(ASLR_ENABLE)
-
-configure: $(CONFIGURE_64)
-
-build: $(BUILD_64)
-
-install: $(INSTALL_64) $(GZGREP_MAN_VARIANTS)
-
-test: $(TEST_64)
-
-system-test: configure $(SYSTEM_TEST_64)
-
+install: $(INSTALL_64) $(GZGREP_MAN_VARIANTS)
REQUIRED_PACKAGES += runtime/python-27
REQUIRED_PACKAGES += shell/bash
-REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/xopen/xcu4