author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
Tue, 05 May 2015 06:49:34 -0500 | |
changeset 4253 | d6f30e77062b |
parent 1823 | aa5916252876 |
permissions | -rw-r--r-- |
1823
aa5916252876
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 |
aa5916252876
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: Solaris-specific; not suitable for upstream |
aa5916252876
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 |
|
aa5916252876
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 |
--- config.layout 2005-02-09 04:18:43.000000000 -0800 |
aa5916252876
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 2014-04-01 06:11:52.176952015 -0700 |
aa5916252876
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 |
@@ -179,21 +179,59 @@ |
aa5916252876
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 |
runtimedir: ${localstatedir}/run |
aa5916252876
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 |
</Layout> |
aa5916252876
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 |
|
aa5916252876
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 |
-# Solaris 8 Layout |
aa5916252876
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 Layout |
aa5916252876
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 |
<Layout Solaris> |
aa5916252876
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 |
- prefix: /usr/apr |
aa5916252876
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-util/1.5 |
aa5916252876
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 |
exec_prefix: ${prefix} |
aa5916252876
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 |
bindir: ${exec_prefix}/bin |
aa5916252876
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 |
sbindir: ${exec_prefix}/bin |
aa5916252876
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 |
libdir: ${exec_prefix}/lib |
aa5916252876
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 |
libexecdir: ${exec_prefix}/libexec |
aa5916252876
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 |
mandir: ${exec_prefix}/man |
aa5916252876
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 |
- sysconfdir: /etc/apr |
aa5916252876
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 |
- datadir: /var/apr |
aa5916252876
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 |
- installbuilddir: ${datadir}/build |
aa5916252876
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 |
+ sysconfdir: /etc/apr-util/1.5 |
aa5916252876
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 |
+ datadir: /var/apr-util/1.5 |
aa5916252876
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 |
includedir: ${exec_prefix}/include |
aa5916252876
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 |
localstatedir: ${prefix} |
aa5916252876
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 |
- runtimedir: /var/run |
aa5916252876
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 |
+ installbuilddir: ${prefix}/build |
aa5916252876
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 |
+ manualdir: ${prefix}/manual |
aa5916252876
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-util/1.5 |
aa5916252876
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: -${APRUTIL_MAJOR_VERSION} |
aa5916252876
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> |
aa5916252876
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 |
+ |
aa5916252876
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> |
aa5916252876
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-util/1.5 |
aa5916252876
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} |
aa5916252876
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 |
aa5916252876
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 |
aa5916252876
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 |
aa5916252876
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 |
aa5916252876
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 |
aa5916252876
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-util/1.5 |
aa5916252876
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-util/1.5 |
aa5916252876
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 |
+ includedir: ${exec_prefix}/include |
aa5916252876
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 |
+ localstatedir: ${prefix} |
aa5916252876
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 |
+ installbuilddir: ${prefix}/build/amd64 |
aa5916252876
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 |
+ manualdir: ${prefix}/manual |
aa5916252876
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 |
+ runtimedir: /var/run/apr-util/1.5 |
aa5916252876
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 |
+ libsuffix: -${APRUTIL_MAJOR_VERSION} |
aa5916252876
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 |
+</Layout> |
aa5916252876
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 |
+ |
aa5916252876
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 |
+<Layout Solaris-sparcv9> |
aa5916252876
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 |
+ prefix: /usr/apr-util/1.5 |
aa5916252876
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 |
+ exec_prefix: ${prefix} |
aa5916252876
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 |
+ bindir: ${exec_prefix}/bin/sparcv9 |
aa5916252876
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 |
+ sbindir: ${exec_prefix}/bin/sparcv9 |
aa5916252876
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 |
+ libdir: ${exec_prefix}/lib/sparcv9 |
aa5916252876
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 |
+ libexecdir: ${exec_prefix}/libexec/sparcv9 |
aa5916252876
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 |
+ mandir: ${exec_prefix}/man |
aa5916252876
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 |
+ sysconfdir: /etc/apr-util/1.5 |
aa5916252876
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 |
+ datadir: /var/apr-util/1.5 |
aa5916252876
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 |
aa5916252876
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} |
aa5916252876
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 |
+ installbuilddir: ${prefix}/build/sparcv9 |
aa5916252876
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 |
+ manualdir: ${prefix}/manual |
aa5916252876
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 |
+ runtimedir: /var/run/apr-util/1.5 |
aa5916252876
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 |
+ libsuffix: -${APRUTIL_MAJOR_VERSION} |
aa5916252876
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 |
</Layout> |
aa5916252876
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 |
|
aa5916252876
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 |
# OpenBSD Layout |