--- a/components/apr-util-1_5/Makefile Wed Mar 30 10:16:56 2016 -0700
+++ b/components/apr-util-1_5/Makefile Wed Mar 30 13:33:31 2016 -0700
@@ -18,15 +18,18 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+
+#
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
+
+# Prefer 32-bit over 64-bit as apr-util has its own custom package layout.
+BUILD_BITS= 32_and_64
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= apr-util
COMPONENT_VERSION= 1.5.4
COMPONENT_PROJECT_URL= http://apr.apache.org/
-COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
COMPONENT_ARCHIVE_HASH= \
sha256:976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE)
@@ -35,10 +38,7 @@
TPNO= 20776
CONFIGURE_DEFAULT_DIRS=no
-
-include $(WS_MAKE_RULES)/prep.mk
-include $(WS_MAKE_RULES)/configure.mk
-include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/common.mk
# Micro version for easy libraries packaging
MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
@@ -46,24 +46,24 @@
PATCH_LEVEL=0
-CONFIGURE_PREFIX=/usr/apr-util/1.5
+CONFIGURE_PREFIX=$(USRDIR)/apr-util/1.5
-CONFIGURE_OPTIONS += --with-mysql=/usr/mysql/5.5
-CONFIGURE_OPTIONS += --with-expat=/usr
-CONFIGURE_OPTIONS += --with-sqlite3=/usr
+CONFIGURE_OPTIONS += --with-mysql=$(USRDIR)/mysql/5.5
+CONFIGURE_OPTIONS += --with-expat=$(USRDIR)
+CONFIGURE_OPTIONS += --with-sqlite3=$(USRDIR)
CONFIGURE_OPTIONS += --with-ldap=ldap_r-2.4
-CONFIGURE_OPTIONS += --with-ldap-include=/usr/include/openldap
+CONFIGURE_OPTIONS += --with-ldap-include=$(USRINCDIR)/openldap
CONFIGURE_OPTIONS += --without-odbc
-CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
CONFIGURE_OPTIONS.32 += --enable-layout=Solaris
CONFIGURE_OPTIONS.64 += --enable-layout=Solaris-$(MACH64)
-CONFIGURE_OPTIONS.32 += --with-apr=/usr/apr/1.5/bin/apr-1-config
-CONFIGURE_OPTIONS.64 += --with-apr=/usr/apr/1.5/bin/$(MACH64)/apr-1-config
-CONFIGURE_OPTIONS.32 += MYSQL_CONFIG=/usr/mysql/5.5/bin/$(MACH32)/mysql_config
+CONFIGURE_OPTIONS.32 += --with-apr=$(USRDIR)/apr/1.5/bin/apr-1-config
+CONFIGURE_OPTIONS.64 += --with-apr=$(USRDIR)/apr/1.5/bin/$(MACH64)/apr-1-config
+CONFIGURE_OPTIONS.32 += MYSQL_CONFIG=$(USRDIR)/mysql/5.5/bin/$(MACH32)/mysql_config
-PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
ifeq ($(strip $(PARFAIT_BUILD)),yes)
-PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN)
+else
+PATH=$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN)
endif
COMPONENT_TEST_TARGETS= test
@@ -74,21 +74,10 @@
docs/doxygen.conf | doxygen - ;
# Some patches need configure script recreation.
-COMPONENT_PREP_ACTION += (cd $(@D); autoconf);
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fi);
ASLR_MODE = $(ASLR_NOT_APPLICABLE)
-configure: $(CONFIGURE_32_and_64)
-
-build: $(BUILD_32_and_64)
-
-install: $(INSTALL_32_and_64)
-
-test: $(TEST_32_and_64)
-
-system-test: $(SYSTEM_TESTS_NOT_IMPLEMENTED)
-
-
REQUIRED_PACKAGES += database/mysql-55
REQUIRED_PACKAGES += database/mysql-55/library
REQUIRED_PACKAGES += database/sqlite-3
@@ -97,5 +86,4 @@
REQUIRED_PACKAGES += library/expat
REQUIRED_PACKAGES += library/openldap
REQUIRED_PACKAGES += shell/ksh93
-REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += system/library/math