author | david.comay@oracle.com |
Fri, 09 Sep 2016 16:31:02 -0700 | |
changeset 6878 | 252671ed151a |
parent 1782 | 5aa8051aaa4b |
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 |
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: 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 |
|
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 |
--- Makefile.in.orig Fri Apr 15 07:23:41 2011 |
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 |
+++ Makefile.in Fri Apr 15 07:23:53 2011 |
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 |
@@ -62,11 +62,19 @@ |
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 |
# Create apr-config script suitable for the install tree |
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 |
apr-config.out: $(APR_CONFIG) |
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 |
- sed 's,^\(location=\).*$$,\1installed,' < $(APR_CONFIG) > $@ |
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 |
+ sed -e 's,^\(location=\).*$$,\1installed,' \ |
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 |
+ -e '/^CC=/s,/.*/,,' \ |
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 |
+ -e '/^CPP=/s,/.*/,,' \ |
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 |
+ -e '/^APR_SOURCE_DIR=/s,/.*",/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
|
15 |
+ -e '/^APR_BUILD_DIR=/s,/.*",/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 |
+ < $(APR_CONFIG) > $@ |
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 |
|
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 |
# Create apr_rules.mk suitable for the install tree |
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 |
build/apr_rules.out: build/apr_rules.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
|
20 |
- sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.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
|
21 |
+ sed -e 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' -e 's,^\(top_build.*=\).*$$,\1$(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
|
22 |
+ -e '/^CC=/s,/.*/,,' \ |
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 |
+ -e '/^MKDEP = /s,/.*/,,' \ |
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 |
+ < build/apr_rules.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
|
25 |
|
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 |
install: $(TARGETS) |
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 |
$(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(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
|
28 |
@@ -79,7 +87,13 @@ |
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 |
$(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp |
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 |
$(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE) |
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 |
for f in libtool shlibtool; do \ |
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 |
- if test -f $${f}; then $(INSTALL) -m 755 $${f} $(DESTDIR)$(installbuilddir); fi; \ |
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 |
+ if test -f $${f}; then \ |
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 |
+ sed -e '/^LTCC=/s,/.*/,,' \ |
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 |
+ -e '/^CC=/s,/.*/,,' \ |
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 |
+ < $${f} > $${f}.out; \ |
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 |
+ $(INSTALL) -m 755 $${f}.out $(DESTDIR)$(installbuilddir)/$${f}; \ |
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 |
+ rm $${f}.out; \ |
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 |
+ fi; \ |
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 |
done |
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 |
$(INSTALL) -m 755 $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(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
|
42 |
for f in make_exports.awk make_var_export.awk; do \ |