components/apr-1_5/patches/config.layout.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 10 Oct 2016 13:26:21 -0700
changeset 7081 616e1d8621e7
parent 1782 5aa8051aaa4b
permissions -rw-r--r--
24824653 improve gobject-introspection typelib dependency tracking
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1782
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     1
Patch origin: in-house
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     2
Patch status: Part 1: Solaris-specific; not suitable for upstream
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     3
Patch status: Part 2: https://issues.apache.org/bugzilla/show_bug.cgi?id=56090
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     4
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     5
--- config.layout	2004-11-24 14:51:51.000000000 -0800
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     6
+++ config.layout	2014-01-27 06:21:54.767926309 -0800
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     7
@@ -179,21 +179,56 @@
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     8
     runtimedir:    ${localstatedir}/run
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
     9
 </Layout>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    10
 
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    11
-#   Solaris 8 Layout
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    12
+#   Solaris Layout
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    13
 <Layout Solaris>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    14
-    prefix:        /usr/apr
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    15
+    prefix:        /usr/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    16
     exec_prefix:   ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    17
     bindir:        ${exec_prefix}/bin
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    18
     sbindir:       ${exec_prefix}/bin
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    19
     libdir:        ${exec_prefix}/lib
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    20
     libexecdir:    ${exec_prefix}/libexec
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    21
     mandir:        ${exec_prefix}/man
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    22
-    sysconfdir:    /etc/apr
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    23
-    datadir:       /var/apr
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    24
-    installbuilddir: ${datadir}/build
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    25
+    sysconfdir:    /etc/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    26
+    datadir:       /var/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    27
+    installbuilddir: ${prefix}/build
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    28
     includedir:    ${exec_prefix}/include
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    29
     localstatedir: ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    30
-    runtimedir:    /var/run
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    31
+    runtimedir:    /var/run/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    32
+    libsuffix:     -${APR_MAJOR_VERSION}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    33
+</Layout>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    34
+
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    35
+<Layout Solaris-amd64>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    36
+    prefix:        /usr/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    37
+    exec_prefix:   ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    38
+    bindir:        ${exec_prefix}/bin/amd64
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    39
+    sbindir:       ${exec_prefix}/bin/amd64
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    40
+    libdir:        ${exec_prefix}/lib/amd64
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    41
+    libexecdir:    ${exec_prefix}/libexec/amd64
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    42
+    mandir:        ${exec_prefix}/man
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    43
+    sysconfdir:    /etc/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    44
+    datadir:       /var/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    45
+    installbuilddir: ${prefix}/build/amd64
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    46
+    includedir:    ${exec_prefix}/include
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    47
+    localstatedir: ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    48
+    runtimedir:    /var/run/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    49
+    libsuffix:     -${APR_MAJOR_VERSION}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    50
+</Layout>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    51
+
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    52
+<Layout Solaris-sparcv9>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    53
+    prefix:        /usr/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    54
+    exec_prefix:   ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    55
+    bindir:        ${exec_prefix}/bin/sparcv9
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    56
+    sbindir:       ${exec_prefix}/bin/sparcv9
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    57
+    libdir:        ${exec_prefix}/lib/sparcv9
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    58
+    libexecdir:    ${exec_prefix}/libexec/sparcv9
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    59
+    mandir:        ${exec_prefix}/man
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    60
+    sysconfdir:    /etc/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    61
+    datadir:       /var/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    62
+    installbuilddir: ${prefix}/build/sparcv9
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    63
+    includedir:    ${exec_prefix}/include
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    64
+    localstatedir: ${prefix}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    65
+    runtimedir:    /var/run/apr/1.5
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    66
+    libsuffix:     -${APR_MAJOR_VERSION}
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    67
 </Layout>
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    68
 
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    69
 #   OpenBSD Layout
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    70
--- configure.in	2013-11-13 04:15:56.000000000 -0800
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    71
+++ configure.in	2014-01-30 04:26:55.991256430 -0800
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    72
@@ -167,6 +167,10 @@
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    73
 
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    74
 echo "APR Version: ${APR_DOTTED_VERSION}"
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    75
 
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    76
+AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    77
+  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    78
+AC_SUBST(installbuilddir)
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    79
+
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    80
 dnl Enable the layout handling code, then reparse the prefix-style
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    81
 dnl arguments due to autoconf being a PITA.
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    82
 APR_ENABLE_LAYOUT(apr)
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    83
@@ -272,10 +276,6 @@
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    84
     ;;
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    85
 esac
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    86
 
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    87
-AC_ARG_WITH(installbuilddir, [  --with-installbuilddir=DIR location to store APR build files (defaults to '${datadir}/build')],
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    88
-  [ installbuilddir=$withval ], [ installbuilddir="${datadir}/build-${APR_MAJOR_VERSION}" ] )
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    89
-AC_SUBST(installbuilddir)
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    90
-
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    91
 AC_ARG_WITH(libtool, [  --without-libtool       avoid using libtool to link the library],
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    92
   [ use_libtool=$withval ], [ use_libtool="yes" ] )
5aa8051aaa4b PSARC/2014/099 APR and APR-util 1.5; EOF APR and APR-util 1.3
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff changeset
    93