--- a/components/sg3_utils/Makefile Thu May 28 17:41:26 2015 -0700
+++ b/components/sg3_utils/Makefile Fri May 29 09:55:43 2015 +0800
@@ -41,14 +41,18 @@
include $(WS_MAKE_RULES)/configure.mk
include $(WS_MAKE_RULES)/ips.mk
+CC += $(CC_BITS)
+
CPPFLAGS += -I$(COMPONENT_DIR)/$(COMPONENT_SRC)/include
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS)"
+COMPONENT_INSTALL_ARGS += bindir=$(USRBINDIR)
+
# Don't use rpath!
COMPONENT_POST_CONFIGURE_ACTION = \
- (cd $(BUILD_DIR_32) ; \
+ (cd $(@D) ; \
$(GSED) -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool ; \
$(GSED) -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool)
@@ -61,16 +65,14 @@
PKG_PROTO_DIRS += $(COMPONENT_DIR)/files
-# common targets
-configure: $(CONFIGURE_32)
-
-build: $(BUILD_32)
+ASLR_MODE = $(ASLR_ENABLE)
-install: $(INSTALL_32)
-
-test: $(TEST_32)
-
+# common targets
+configure: $(CONFIGURE_32_and_64)
+build: $(BUILD_32_and_64)
+install: $(INSTALL_32_and_64)
+# Even though "gmake check" goes to completion, it doesn't really do anything.
+test: $(NO_TESTS)
system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
REQUIRED_PACKAGES += system/library
--- a/components/sg3_utils/sg3_utils.p5m Thu May 28 17:41:26 2015 -0700
+++ b/components/sg3_utils/sg3_utils.p5m Fri May 29 09:55:43 2015 +0800
@@ -80,6 +80,9 @@
file path=usr/bin/sg_write_buffer
file path=usr/bin/sg_write_long
file path=usr/bin/sg_write_same
+link path=usr/lib/$(MACH64)/libsgutils2.so target=libsgutils2.so.2.0.0
+link path=usr/lib/$(MACH64)/libsgutils2.so.2 target=libsgutils2.so.2.0.0
+file path=usr/lib/$(MACH64)/libsgutils2.so.2.0.0
link path=usr/lib/libsgutils2.so target=libsgutils2.so.2.0.0
link path=usr/lib/libsgutils2.so.2 target=libsgutils2.so.2.0.0
file path=usr/lib/libsgutils2.so.2.0.0