18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 include ../../make-rules/shared-macros.mk |
26 include ../../make-rules/shared-macros.mk |
27 |
27 |
28 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
28 PATH=$(dir $(CC)):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin |
29 |
29 |
30 COMPONENT_NAME= subversion |
30 COMPONENT_NAME= subversion |
31 COMPONENT_VERSION= 1.7.19 |
31 COMPONENT_VERSION= 1.7.5 |
32 COMPONENT_PROJECT_URL= http://subversion.apache.org/ |
32 COMPONENT_PROJECT_URL= http://subversion.apache.org/ |
33 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
33 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) |
34 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz |
34 COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz |
35 COMPONENT_ARCHIVE_HASH= \ |
35 COMPONENT_ARCHIVE_HASH= \ |
36 sha256:184246bf5ccd0cb31f296b87fdae72617e445901b468529e638b919ca4012d4f |
36 sha256:cb102a437335a8921f00cef9bf730d84527713f1a5091e3e1eb2f16402f85dc1 |
37 COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE) |
37 COMPONENT_ARCHIVE_URL= http://archive.apache.org/dist/subversion/$(COMPONENT_ARCHIVE) |
38 COMPONENT_BUGDB= utility/svn |
38 COMPONENT_BUGDB= utility/svn |
39 TPNO= 21233 |
|
40 |
39 |
41 include ../../make-rules/prep.mk |
40 include ../../make-rules/prep.mk |
42 include ../../make-rules/configure.mk |
41 include ../../make-rules/configure.mk |
43 include ../../make-rules/ips.mk |
42 include ../../make-rules/ips.mk |
44 |
43 |
45 PATCH_LEVEL = 0 |
44 PATCH_LEVEL = 0 |
|
45 |
46 PYMODS = client core delta fs ra repos wc |
46 PYMODS = client core delta fs ra repos wc |
|
47 |
47 PLMODS= Fs Core Wc Client Repos Ra Delta |
48 PLMODS= Fs Core Wc Client Repos Ra Delta |
|
49 |
48 JAVA_ROOT = $(JAVA_HOME) |
50 JAVA_ROOT = $(JAVA_HOME) |
49 |
51 |
50 # because we can't seem to get -norunpath to the java bindings build any |
52 # because we can't seem to get -norunpath to the java bindings build any |
51 # other way. |
53 # other way. |
52 CXX += $(studio_NORUNPATH) |
54 CXX += $(studio_NORUNPATH) |
53 |
55 |
54 CFLAGS += -features=extensions |
56 CFLAGS += -features=extensions |
|
57 CFLAGS += -xustr=ascii_utf16_ushort -xcsi |
55 CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic |
58 CXXFLAGS += -features=nestedaccess,tmplife,tmplrefstatic |
56 CXXFLAGS += -template=geninlinefuncs |
59 CXXFLAGS += -template=geninlinefuncs |
|
60 CXXFLAGS += -verbose=template |
|
61 CXXFLAGS += -xustr=ascii_utf16_ushort |
57 CXXFLAGS += $(CC_PIC) |
62 CXXFLAGS += $(CC_PIC) |
58 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS |
63 CXXFLAGS += -mt -D_REENTRANT -DNDEBUG -DSOLARIS |
59 CFLAGS += `pkg-config --cflags neon` |
64 CFLAGS += `pkg-config --cflags neon` |
60 CFLAGS += $(CPP_LARGEFILES) |
65 CFLAGS += $(CPP_LARGEFILES) |
61 |
|
62 APR_VERSION = 1.3 |
|
63 APR_UTIL_VERSION = 1.3 |
|
64 |
66 |
65 # Let's write some post-configure hacks |
67 # Let's write some post-configure hacks |
66 COMPONENT_POST_CONFIGURE_ACTION = \ |
68 COMPONENT_POST_CONFIGURE_ACTION = \ |
67 ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \ |
69 ( $(CLONEY) $(SOURCE_DIR) $(@D) ; \ |
68 cd $(SOURCE_DIR) ; \ |
70 cd $(SOURCE_DIR) ; \ |
84 CONFIGURE_ENV += PYMODS="$(PYMODS)" |
86 CONFIGURE_ENV += PYMODS="$(PYMODS)" |
85 CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)" |
87 CONFIGURE_ENV += PYTHONPATH="$(PYTHON_VENDOR_PACKAGES)" |
86 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" |
88 CONFIGURE_ENV += JAVA_ROOT="$(JAVA_ROOT)" |
87 CONFIGURE_ENV += PERL="$(PERL)" |
89 CONFIGURE_ENV += PERL="$(PERL)" |
88 CONFIGURE_ENV += PLMODS="$(PLMODS)" |
90 CONFIGURE_ENV += PLMODS="$(PLMODS)" |
89 |
|
90 LIBSVNDIR.32 = $(CONFIGURE_PREFIX)/lib/svn |
|
91 APR-CONFIG.32 = /usr/apr/$(APR_VERSION)/bin/apr-1-config |
|
92 APU-CONFIG.32 = /usr/apr-util/$(APR_UTIL_VERSION)/bin/apu-1-config |
|
93 APXS.32 = /usr/apache2/2.2/bin/apxs |
|
94 APR-CONFIG-RPATH.32 = /usr/apr/$(APR_VERSION)/lib |
|
95 APU-CONFIG-RPATH.32 = /usr/apr-util/$(APR_VERSION)/lib |
|
96 APACHE_LIBEXECDIR.32 = `$(APXS.32) -q libexecdir` |
|
97 |
|
98 LDFLAGS += -R$(LIBSVNDIR.$(BITS)) -R$(APR-CONFIG-RPATH.$(BITS)) \ |
|
99 -R$(APU-CONFIG-RPATH.$(BITS)) |
|
100 |
|
101 CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" |
|
102 |
|
103 # Current version of subversion only supports ruby 1.8, not 1.9. |
91 # Current version of subversion only supports ruby 1.8, not 1.9. |
104 # Until subversion is updated to 1.8.0 (ruby 1.9 support added) |
92 # Until subversion is updated to 1.8.0 (ruby 1.9 support added) |
105 # or later, use ruby 1.8. |
93 # or later, use ruby 1.8. |
106 CONFIGURE_ENV += RUBY="$(RUBY.1.8)" |
94 CONFIGURE_ENV += RUBY="$(RUBY.1.8)" |
107 |
95 |
108 # Let's make noise just because we have to override --libdir |
96 # Let's make noise just because we have to override --libdir |
109 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
97 CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) |
110 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
98 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR) |
111 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |
99 CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS)) |
112 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS)) |
100 CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS)) |
113 CONFIGURE_OPTIONS += --libdir=$(LIBSVNDIR.$(BITS)) |
101 CONFIGURE_OPTIONS += --libdir=$(CONFIGURE_PREFIX)/lib/svn |
114 CONFIGURE_OPTIONS += --localstatedir=/var |
102 CONFIGURE_OPTIONS += --localstatedir=/var |
115 CONFIGURE_OPTIONS += --enable-shared |
103 CONFIGURE_OPTIONS += --enable-shared |
116 CONFIGURE_OPTIONS += --disable-static |
104 CONFIGURE_OPTIONS += --disable-static |
117 CONFIGURE_OPTIONS += --disable-libtool-lock |
105 CONFIGURE_OPTIONS += --disable-libtool-lock |
118 CONFIGURE_OPTIONS += --disable-neon-version-check |
106 CONFIGURE_OPTIONS += --disable-neon-version-check |
119 CONFIGURE_OPTIONS += --disable-experimental-libtool |
107 CONFIGURE_OPTIONS += --disable-experimental-libtool |
120 CONFIGURE_OPTIONS += --with-apxs=$(APXS.$(BITS)) |
108 CONFIGURE_OPTIONS += --with-apxs=/usr/apache2/2.2/bin/apxs |
121 CONFIGURE_OPTIONS += --with-ssl |
109 CONFIGURE_OPTIONS += --with-ssl |
122 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX) |
110 CONFIGURE_OPTIONS += --with-zlib=$(CONFIGURE_PREFIX) |
123 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT) |
111 CONFIGURE_OPTIONS += --with-jdk=$(JAVA_ROOT) |
124 CONFIGURE_OPTIONS += --with-apr=/usr/apr/$(APR_VERSION) |
112 CONFIGURE_OPTIONS += --with-apr=/usr/apr/1.3 |
125 CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/$(APR_UTIL_VERSION) |
113 CONFIGURE_OPTIONS += --with-apr-util=/usr/apr-util/1.3 |
126 CONFIGURE_OPTIONS += --enable-nls |
114 CONFIGURE_OPTIONS += --enable-nls |
127 CONFIGURE_OPTIONS += --disable-mod-activation |
115 CONFIGURE_OPTIONS += --disable-mod-activation |
128 CONFIGURE_OPTIONS += --enable-javahl |
116 CONFIGURE_OPTIONS += --enable-javahl |
129 CONFIGURE_OPTIONS += --with-swig |
117 CONFIGURE_OPTIONS += --with-swig |
130 CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX) |
118 CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX) |