components/apr-util-1_5/patches/config.layout.patch
author Petr Sumbera <petr.sumbera@oracle.com>
Wed, 04 Feb 2015 04:20:03 -0800
branchs11-update
changeset 3802 c3fd3eae5cb1
permissions -rw-r--r--
PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3 18503507 APR-util 1.5.3 20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4

Patch origin: in-house
Patch status: Solaris-specific; not suitable for upstream

--- config.layout	2005-02-09 04:18:43.000000000 -0800
+++ config.layout	2014-04-01 06:11:52.176952015 -0700
@@ -179,21 +179,59 @@
     runtimedir:    ${localstatedir}/run
 </Layout>
 
-#   Solaris 8 Layout
+#   Solaris Layout
 <Layout Solaris>
-    prefix:        /usr/apr
+    prefix:        /usr/apr-util/1.5
     exec_prefix:   ${prefix}
     bindir:        ${exec_prefix}/bin
     sbindir:       ${exec_prefix}/bin
     libdir:        ${exec_prefix}/lib
     libexecdir:    ${exec_prefix}/libexec
     mandir:        ${exec_prefix}/man
-    sysconfdir:    /etc/apr
-    datadir:       /var/apr
-    installbuilddir: ${datadir}/build
+    sysconfdir:    /etc/apr-util/1.5
+    datadir:       /var/apr-util/1.5
     includedir:    ${exec_prefix}/include
     localstatedir: ${prefix}
-    runtimedir:    /var/run
+    installbuilddir: ${prefix}/build
+    manualdir:     ${prefix}/manual
+    runtimedir:    /var/run/apr-util/1.5
+    libsuffix:     -${APRUTIL_MAJOR_VERSION}
+</Layout>
+
+<Layout Solaris-amd64>
+    prefix:        /usr/apr-util/1.5
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin/amd64
+    sbindir:       ${exec_prefix}/bin/amd64
+    libdir:        ${exec_prefix}/lib/amd64
+    libexecdir:    ${exec_prefix}/libexec/amd64
+    mandir:        ${exec_prefix}/man
+    sysconfdir:    /etc/apr-util/1.5
+    datadir:       /var/apr-util/1.5
+    includedir:    ${exec_prefix}/include
+    localstatedir: ${prefix}
+    installbuilddir: ${prefix}/build/amd64
+    manualdir:     ${prefix}/manual
+    runtimedir:    /var/run/apr-util/1.5
+    libsuffix:     -${APRUTIL_MAJOR_VERSION}
+</Layout>
+
+<Layout Solaris-sparcv9>
+    prefix:        /usr/apr-util/1.5
+    exec_prefix:   ${prefix}
+    bindir:        ${exec_prefix}/bin/sparcv9
+    sbindir:       ${exec_prefix}/bin/sparcv9
+    libdir:        ${exec_prefix}/lib/sparcv9
+    libexecdir:    ${exec_prefix}/libexec/sparcv9
+    mandir:        ${exec_prefix}/man
+    sysconfdir:    /etc/apr-util/1.5
+    datadir:       /var/apr-util/1.5
+    includedir:    ${exec_prefix}/include
+    localstatedir: ${prefix}
+    installbuilddir: ${prefix}/build/sparcv9
+    manualdir:     ${prefix}/manual
+    runtimedir:    /var/run/apr-util/1.5
+    libsuffix:     -${APRUTIL_MAJOR_VERSION}
 </Layout>
 
 #   OpenBSD Layout