Print this page
OS-3330 NTP should ship with CTF data
OS-3331 OpenLLDP should ship with CTF data
| Split |
Close |
| Expand all |
| Collapse all |
--- old/./Makefile.defs
+++ new/./Makefile.defs
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License, Version 1.0 only
6 6 # (the "License"). You may not use this file except in compliance
7 7 # with the License.
8 8 #
9 9 # You can obtain a copy of the license at COPYING
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at COPYING.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
20 20 #
21 21 # Copyright (c) 2014, Joyent, Inc.
22 22 #
23 23
24 24 BASE = $(PWD)
25 25 DESTDIR = $(BASE)/../proto
26 26 VER.32 = $(VER)-32$(STRAP)
27 27 VER.64 = $(VER)-64$(STRAP)
28 28 OBJ.32 = $(VER.32)$(SEPARATE_BUILD:yes=.build)
29 29 OBJ.64 = $(VER.64)$(SEPARATE_BUILD:yes=.build)
30 +CTF.32 = ctfobjects-32$(STRAP)
31 +CTF.64 = ctfobjects-64$(STRAP)
30 32
31 33 ifeq ($(STRAP),strap)
32 34 STRAPPROTO = $(DESTDIR)
33 35 else
34 36 STRAPPROTO = $(DESTDIR:proto=proto.strap)
35 37 endif
36 38
37 39 PATH = $(STRAPPROTO)/usr/bin:/usr/bin:/usr/sbin:/sbin:/opt/local/bin
38 40
39 41 MAKE = gmake
40 42 PARALLEL = -j128
41 43 MAKE_VERBOSE = V=1
42 44 GCC = $(DESTDIR)/usr/bin/gcc
43 45 GXX = $(DESTDIR)/usr/bin/g++
44 46 GCC.64 = $(GCC) -m64
45 47 GXX.64 = $(GXX) -m64
46 48
47 49 GCC.host = /opt/local/bin/gcc
48 50 GXX.host = /opt/local/bin/g++
49 51 GCC.host.64 = $(GCC.host) -m64
50 52 GXX.host.64 = $(GXX.host) -m64
51 53
52 54 LEX = /opt/local/bin/lex
53 55 YACC = /opt/local/bin/yacc
54 56 GPATCH = /opt/local/bin/gpatch
55 57
56 58 SYSINCDIRS = /usr/include
57 59 SYSLIBDIRS = /usr/lib /lib
58 60
59 61 BUILD32 = yes
60 62 BUILD64 =
61 63 SEPARATE_BUILD =
62 64
63 65 CPPFLAGS = $(SYSINCDIRS:%=-isystem $(DESTDIR)/%)
64 66
65 67 #
66 68 # We ship platform-private perl modules (e.g. from ntp) in this directory,
67 69 # and using this perl interpeter:
68 70 #
69 71 PATH_PERL = /usr/perl5/bin/perl
70 72 PERLLIBDIR = /usr/perl5/5.12/lib
71 73
72 74 #
73 75 # These are all definitions that relate to Sun Make. There are basically two
74 76 # different sets that we care about. The first is the boostrap make. This is
75 77 # used to build the strap make. Once we have the strap make, it is used for all
76 78 # other makes. Beacuse MAKE is used extensively to mean GNU make in these
77 79 # makefiles, we instead use SUN_MAKE and SUM_MAKE_STRAP.
78 80 #
79 81 SUN_MAKE_STRAP=/opt/local/bin/dmake
80 82 SUN_MAKE=$(STRAPPROTO)/usr/bin/dmake
81 83
82 84 #
83 85 # Because of bugs in ntp, we need to be able to refer to the target specific
84 86 # flags as well as the generic flags later on.
85 87 #
86 88 ifneq ($(STRAP),strap)
87 89 GENLDFLAGS = -Wl,-zassert-deflib -Wl,-zfatal-warnings
88 90 endif
89 91 T32_LDFLAGS = $(SYSLIBDIRS:%=-L$(DESTDIR)/%)
90 92 T64_LDFLAGS = $(SYSLIBDIRS:%=-L$(DESTDIR)/%/64)
91 93 LDFLAGS = $(T32_LDFLAGS) $(GENLDFLAGS)
92 94 LDFLAGS.64 = $(T64_LDFLAGS) $(GENLDFLAGS)
93 95
94 96 AUTOCONF_CC = CC="$(GCC)"
95 97 AUTOCONF_CXX = CXX="$(GXX)"
96 98 AUTOCONF_CC.64 = CC="$(GCC.64)"
97 99 AUTOCONF_CXX.64 = CXX="$(GXX.64)"
98 100 AUTOCONF_CPPFLAGS = CPPFLAGS="$(CPPFLAGS)"
99 101 AUTOCONF_CFLAGS = CFLAGS="$(CFLAGS)"
100 102 AUTOCONF_CFLAGS.64 = CFLAGS="$(CFLAGS.64)"
101 103 AUTOCONF_LDFLAGS = LDFLAGS="$(LDFLAGS)"
102 104 AUTOCONF_LDFLAGS.64 = LDFLAGS="$(LDFLAGS.64)"
103 105 AUTOCONF_LIBS = LIBS="$(LIBS)"
104 106 AUTOCONF_LIBS.64 = LIBS="$(LIBS.64)"
105 107
106 108 AUTOCONF_OUT = config.status
107 109 AUTOCONF_OUT.32 = $(OBJ.32)/$(AUTOCONF_OUT)
108 110 AUTOCONF_OUT.64 = $(OBJ.64)/$(AUTOCONF_OUT)
109 111
110 112 AUTOCONF_PREFIX = /usr
111 113
112 114 AUTOCONF_ENV = \
113 115 PKG_CONFIG_LIBDIR="" \
114 116 $(AUTOCONF_CC) \
115 117 $(AUTOCONF_CXX) \
116 118 $(AUTOCONF_CPPFLAGS) \
117 119 $(AUTOCONF_CFLAGS) \
118 120 $(AUTOCONF_LDFLAGS) \
119 121 $(AUTOCONF_LIBS)
120 122
121 123 AUTOCONF_ENV.64 = \
122 124 PKG_CONFIG_LIBDIR="" \
123 125 $(AUTOCONF_CC.64) \
124 126 $(AUTOCONF_CXX.64) \
125 127 $(AUTOCONF_CPPFLAGS) \
126 128 $(AUTOCONF_CFLAGS.64) \
127 129 $(AUTOCONF_LDFLAGS.64) \
128 130 $(AUTOCONF_LIBS.64)
129 131
130 132 AUTOCONF_OPTS = \
131 133 --prefix=$(AUTOCONF_PREFIX)
132 134
133 135 AUTOCONF_OPTS.32 = \
134 136 $(AUTOCONF_OPTS)
135 137
136 138 AUTOCONF_OPTS.64 = \
137 139 $(AUTOCONF_OPTS)
138 140
139 141 ALL_TGT =
140 142 OVERRIDES = $(MAKE_VERBOSE)
141 143
142 144 TARBALL = $(VER).tar.gz
143 145 TARBALL_COMPRESS = -z
144 146
145 147 UNPACK_SENTINEL = configure
146 148 FROB_SENTINEL.32 = chmod 755 $(VER.32)/$(UNPACK_SENTINEL)
147 149 FROB_SENTINEL.64 = chmod 755 $(VER.64)/$(UNPACK_SENTINEL)
148 150
149 151 PATCHSTRIP = 1
150 152
151 153 APPLY_PATCHES.32 = \
|
↓ open down ↓ |
112 lines elided |
↑ open up ↑ |
152 154 for p in $(PATCHES); do \
153 155 echo "Applying $$p"; \
154 156 $(GPATCH) -d .unpack32/$(VER) -p$(PATCHSTRIP) < "$$p" || exit 1; \
155 157 done
156 158
157 159 APPLY_PATCHES.64 = \
158 160 for p in $(PATCHES); do \
159 161 echo "Applying $$p"; \
160 162 $(GPATCH) -d .unpack64/$(VER) -p$(PATCHSTRIP) < "$$p" || exit 1; \
161 163 done
164 +
165 +MAKE_CTF = $(BASE)/../tools/make-ctf
166 +MAKE_CTF.32 = $(MAKE_CTF) $(OBJ.32) $(CTF.32) $(VER)
167 +MAKE_CTF.64 = $(MAKE_CTF) $(OBJ.64) $(CTF.64) $(VER)
162 168
163 169 .DEFAULT_GOAL = all
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX