| author | Shawn Walker-Salas <shawn.walker@oracle.com> |
| Wed, 30 Mar 2016 13:33:31 -0700 | |
| changeset 5682 | 94c0ca64c022 |
| parent 4943 | 1d2d4cba41b1 |
| child 6023 | 1285c8b9e736 |
| 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 |
# |
|
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 |
# CDDL HEADER START |
|
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 |
# The contents of this file are subject to the terms of the |
|
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 |
# Common Development and Distribution License (the "License"). |
|
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 |
# You may not use this file except in compliance with the License. |
|
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 |
# |
|
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 |
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE |
|
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 |
# or http://www.opensolaris.org/os/licensing. |
|
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 |
# See the License for the specific language governing permissions |
|
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 |
# and limitations under the License. |
|
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 |
# |
|
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 |
# When distributing Covered Code, include this CDDL HEADER in each |
|
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 |
# file and include the License file at usr/src/OPENSOLARIS.LICENSE. |
|
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 |
# If applicable, add the following below this CDDL HEADER, with the |
|
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 |
# fields enclosed by brackets "[]" replaced with your own identifying |
|
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 |
# information: Portions Copyright [yyyy] [name of copyright owner] |
|
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 |
# |
|
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 |
# CDDL HEADER END |
|
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 |
# |
|
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. |
|
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
|
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-util 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 |
|
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
|
28 |
include ../../make-rules/shared-macros.mk |
|
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 |
|
|
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 |
COMPONENT_NAME= apr-util |
|
3554
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
31 |
COMPONENT_VERSION= 1.5.4 |
|
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
|
32 |
COMPONENT_PROJECT_URL= http://apr.apache.org/ |
|
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 |
COMPONENT_ARCHIVE_HASH= \ |
|
3554
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
34 |
sha256:976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 |
|
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
|
35 |
COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/apr/$(COMPONENT_ARCHIVE) |
|
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 |
COMPONENT_BUGDB= utility/apache |
|
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 |
|
|
3554
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
38 |
TPNO= 20776 |
|
1948
2d1537e7942d
18978320 Userland components should specify TPNOs in Makefiles instead of pkg manifests
John Beck <John.Beck@Oracle.COM>
parents:
1823
diff
changeset
|
39 |
|
|
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
|
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 |
|
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
|
42 |
|
|
3554
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
43 |
# Micro version for easy libraries packaging |
|
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
44 |
MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
|
|
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
45 |
PKG_MACROS+= MICRO_VERSION=$(MICRO_VERSION) |
|
ef58713bafc4
20220349 Upgrade Apache Portable Runtime Utility (APR-util) to version 1.5.4
Petr Sumbera <petr.sumbera@oracle.com>
parents:
2225
diff
changeset
|
46 |
|
|
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
|
47 |
PATCH_LEVEL=0 |
|
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 |
|
|
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-util/1.5 |
|
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
|
50 |
|
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
51 |
CONFIGURE_OPTIONS += --with-mysql=$(USRDIR)/mysql/5.5 |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
52 |
CONFIGURE_OPTIONS += --with-expat=$(USRDIR) |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
53 |
CONFIGURE_OPTIONS += --with-sqlite3=$(USRDIR) |
|
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
|
54 |
CONFIGURE_OPTIONS += --with-ldap=ldap_r-2.4 |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
55 |
CONFIGURE_OPTIONS += --with-ldap-include=$(USRINCDIR)/openldap |
|
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
|
56 |
CONFIGURE_OPTIONS += --without-odbc |
|
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 |
CONFIGURE_OPTIONS.32 += --enable-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
|
58 |
CONFIGURE_OPTIONS.64 += --enable-layout=Solaris-$(MACH64) |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
59 |
CONFIGURE_OPTIONS.32 += --with-apr=$(USRDIR)/apr/1.5/bin/apr-1-config |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
60 |
CONFIGURE_OPTIONS.64 += --with-apr=$(USRDIR)/apr/1.5/bin/$(MACH64)/apr-1-config |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
61 |
CONFIGURE_OPTIONS.32 += MYSQL_CONFIG=$(USRDIR)/mysql/5.5/bin/$(MACH32)/mysql_config |
|
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
|
62 |
|
|
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 |
ifeq ($(strip $(PARFAIT_BUILD)),yes) |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
64 |
PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN) |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
65 |
else |
|
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
66 |
PATH=$(SPRO_VROOT)/bin:$(USRBINDIR):$(GNUBIN) |
|
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
|
67 |
endif |
|
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 |
|
|
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 |
COMPONENT_TEST_TARGETS= test |
|
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 |
$(INSTALL_64): COMPONENT_POST_INSTALL_ACTION += \ |
|
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
|
72 |
cd $(SOURCE_DIR); \ |
|
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
|
73 |
sed 's;OUTPUT_DIRECTORY=.*;OUTPUT_DIRECTORY=$(PROTO_DIR)$(CONFIGURE_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
|
74 |
docs/doxygen.conf | doxygen - ; |
|
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
|
75 |
|
|
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
|
76 |
# Some patches need configure script recreation. |
|
5682
94c0ca64c022
15558602 TCL_LD_SEARCH_FLAGS is wrongly defined in tclConfig.sh
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
4943
diff
changeset
|
77 |
COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fi); |
|
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
|
78 |
|
|
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
|
79 |
ASLR_MODE = $(ASLR_NOT_APPLICABLE) |
|
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
|
80 |
|
|
4943
1d2d4cba41b1
21935089 Missing package requirements to build Userland gate on 11.3
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
4339
diff
changeset
|
81 |
REQUIRED_PACKAGES += database/mysql-55 |
|
3817
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
82 |
REQUIRED_PACKAGES += database/mysql-55/library |
|
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
83 |
REQUIRED_PACKAGES += database/sqlite-3 |
|
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 += developer/documentation-tool/doxygen |
|
3817
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
85 |
REQUIRED_PACKAGES += library/apr-15 |
|
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
86 |
REQUIRED_PACKAGES += library/expat |
|
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
87 |
REQUIRED_PACKAGES += library/openldap |
|
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
88 |
REQUIRED_PACKAGES += shell/ksh93 |
|
30b42c38bbc4
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
Norm Jacobs <Norm.Jacobs@Sun.COM>
parents:
3554
diff
changeset
|
89 |
REQUIRED_PACKAGES += system/library/math |