author | zihao.zhu@oracle.com <zihao.zhu@oracle.com> |
Tue, 03 May 2016 19:23:30 -0700 | |
changeset 5911 | a8d897c4c442 |
parent 5737 | 6ccbf34f1588 |
child 7687 | 1093e2a9adbd |
permissions | -rw-r--r-- |
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 |
# |
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 |
# CDDL HEADER START |
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 |
# |
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 |
# The contents of this file are subject to the terms of the |
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 |
# Common Development and Distribution License (the "License"). |
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 |
# You may not use this file except in compliance with the License. |
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 |
# |
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 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
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 |
# or http://www.opensolaris.org/os/licensing. |
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 |
# See the License for the specific language governing permissions |
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 |
# and limitations under the License. |
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 |
# |
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 |
# When distributing Covered Code, include this CDDL HEADER in each |
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 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
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 |
# If applicable, add the following below this CDDL HEADER, with the |
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 |
# fields enclosed by brackets "[]" replaced with your own identifying |
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 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
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 |
# |
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 |
# CDDL HEADER END |
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 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
21 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
22 |
# |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
23 |
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. |
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
|
24 |
# |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
25 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
26 |
# Prefer 32-bit over 64-bit as apr has its own custom package layout. |
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
27 |
BUILD_BITS= 32_and_64 |
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
|
28 |
include ../../make-rules/shared-macros.mk |
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 |
|
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 |
COMPONENT_NAME= apr |
5737
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
31 |
COMPONENT_VERSION= 1.5.2 |
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
|
32 |
COMPONENT_PROJECT_URL= http://apr.apache.org/ |
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 |
COMPONENT_ARCHIVE_HASH= \ |
5737
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
34 |
sha256:1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb |
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
|
35 |
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE) |
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 |
COMPONENT_BUGDB= utility/apache |
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 |
|
5737
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
38 |
TPNO= 27510 |
1948
2d1537e7942d
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
1899
diff
changeset
|
39 |
|
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
|
40 |
CONFIGURE_DEFAULT_DIRS=no |
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
41 |
include $(WS_MAKE_RULES)/common.mk |
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
|
42 |
|
3543
206d6ffc614a
20179862 Upgrade Apache Portable Runtime (APR) to version 1.5.1
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
43 |
# Micro version for easy libraries packaging |
206d6ffc614a
20179862 Upgrade Apache Portable Runtime (APR) to version 1.5.1
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
44 |
MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }') |
206d6ffc614a
20179862 Upgrade Apache Portable Runtime (APR) to version 1.5.1
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
45 |
PKG_MACROS+= MICRO_VERSION=$(MICRO_VERSION) |
206d6ffc614a
20179862 Upgrade Apache Portable Runtime (APR) to version 1.5.1
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
46 |
|
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
|
47 |
PATCH_LEVEL=0 |
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 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
49 |
CONFIGURE_PREFIX=$(USRDIR)/apr/1.5 |
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
|
50 |
|
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 |
CONFIGURE_OPTIONS += --enable-threads |
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 |
CONFIGURE_OPTIONS += --enable-other-child |
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 |
CONFIGURE_OPTIONS += --enable-nonportable-atomics |
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 |
CONFIGURE_OPTIONS += --enable-shared |
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 |
CONFIGURE_OPTIONS += --disable-static |
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 |
CONFIGURE_OPTIONS += LTFLAGS="--tag=CC --silent" |
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 |
CONFIGURE_OPTIONS.32 += --enable-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
|
58 |
CONFIGURE_OPTIONS.64 += --enable-layout=Solaris-$(MACH64) |
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 |
|
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 |
COMPONENT_TEST_TARGETS= test |
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 |
|
5737
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
62 |
COMPONENT_TEST_TRANSFORMS += \ |
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
63 |
'-e "/microseconds: [0-9]* usec/d" ' \ |
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
64 |
'-e "/^APR Lock Performance Test/,/make\[2\]: Leaving directory/p" ' \ |
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
65 |
'-e "/.*/d" ' |
6ccbf34f1588
23067984 Upgrade Apache Portable Runtime (APR) to version 1.5.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
5726
diff
changeset
|
66 |
|
5726
62c75f323a0f
23042381 apache modules fail to build after apr makefile changes
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5682
diff
changeset
|
67 |
# Some patches need configure script recreation; autoreconf is not used here as |
62c75f323a0f
23042381 apache modules fail to build after apr makefile changes
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5682
diff
changeset
|
68 |
# it will overwrite the patch to the libtool scripts. |
62c75f323a0f
23042381 apache modules fail to build after apr makefile changes
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
5682
diff
changeset
|
69 |
COMPONENT_PREP_ACTION += (cd $(@D); autoconf); |
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
|
70 |
|
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 |
# 32 and 64 bits apr.h headers need to be merged to the final one. |
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 |
APRH=include/apr.h |
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 |
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \ |
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 |
diff -D __$(MACH64) $(BUILD_DIR_32)/$(APRH) \ |
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 |
$(BUILD_DIR_64)/$(APRH) > $(PROTO_DIR)$(CONFIGURE_PREFIX)/$(APRH); |
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 |
|
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 |
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \ |
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 |
cd $(SOURCE_DIR); \ |
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 |
sed 's;OUTPUT_DIRECTORY=.*;OUTPUT_DIRECTORY=$(PROTO_DIR)$(CONFIGURE_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
|
80 |
docs/doxygen.conf | doxygen - ; |
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 |
|
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 |
ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
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 |
|
4943
1d2d4cba41b1
21935089 Missing package requirements to build Userland gate on 11.3
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
4339
diff
changeset
|
84 |
REQUIRED_PACKAGES += database/mysql-55 |
3817
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3543
diff
changeset
|
85 |
REQUIRED_PACKAGES += developer/documentation-tool/doxygen |
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3543
diff
changeset
|
86 |
REQUIRED_PACKAGES += shell/bash |
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3543
diff
changeset
|
87 |
REQUIRED_PACKAGES += shell/ksh93 |