--- a/components/apr-util/Makefile	Wed Apr 02 05:41:43 2014 -0700
+++ b/components/apr-util/Makefile	Thu Apr 03 01:16:22 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -42,7 +42,7 @@
 
 CONFIGURE_PREFIX=/usr/apr-util/1.3
 
-CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.1
+CONFIGURE_OPTIONS +=	--with-mysql=/usr/mysql/5.5
 CONFIGURE_OPTIONS +=	--with-expat=/usr
 CONFIGURE_OPTIONS +=	--with-sqlite3=/usr
 CONFIGURE_OPTIONS +=	--with-ldap=ldap_r-2.4
@@ -53,7 +53,7 @@
 CONFIGURE_OPTIONS.64 +=	--enable-layout=OpenSolaris-$(MACH64)
 CONFIGURE_OPTIONS.32 +=	--with-apr=/usr/apr/1.3/bin/apr-1-config
 CONFIGURE_OPTIONS.64 +=	--with-apr=/usr/apr/1.3/bin/$(MACH64)/apr-1-config
-CONFIGURE_OPTIONS.64 +=	MYSQL_CONFIG=/usr/mysql/5.1/bin/$(MACH64)/mysql_config
+CONFIGURE_OPTIONS.32 +=	MYSQL_CONFIG=/usr/mysql/5.5/bin/$(MACH32)/mysql_config
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
@@ -70,12 +70,19 @@
 PKG_PROTO_DIRS += $(BUILD_DIR)/$(MACH32)/docs/dox/html
 PKG_PROTO_DIRS += $(BUILD_DIR)/$(MACH32)/docs/dox/html/search
 
+ASLR_MODE = $(ASLR_NOT_APPLICABLE)
+
 docs: $(BUILD_DIR)/$(MACH32)/.built
 	cd $(BUILD_DIR)/$(MACH32); doxygen docs/doxygen.conf
 
 build: $(BUILD_32_and_64) docs
 
 install: $(INSTALL_32_and_64)
+	# workaround for 18195512
+	elfedit -e "dyn:runpath /usr/mysql/5.5/lib/" \
+	  $(PROTO_DIR)/usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql-1.so
+	elfedit -e "dyn:runpath /usr/mysql/5.5/lib/$(MACH64)" \
+	  $(PROTO_DIR)/usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql-1.so
 
 test: $(TEST_32_and_64)
 

--- a/components/apr-util/resolve.deps	Wed Apr 02 05:41:43 2014 -0700
+++ b/components/apr-util/resolve.deps	Thu Apr 03 01:16:22 2014 -0700
@@ -1,4 +1,4 @@
-database/mysql-51/library
+database/mysql-55/library
 database/sqlite-3
 library/apr-13
 library/expat