1 https://rt.openssl.org/Ticket/Display.html?id=2084&user=guest&pass=guest
2 https://rt.openssl.org/Ticket/Display.html?id=3738&user=guest&pass=guest
3
4 --- openssl-1.0.2d/crypto/Makefile
5 +++ openssl-1.0.2d/crypto/Makefile
6 @@ -85,11 +85,11 @@
7 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
8
9 subdirs:
10 - @target=all; $(RECURSIVE_MAKE)
11 + +@target=all; $(RECURSIVE_MAKE)
12
13 files:
14 $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
15 - @target=files; $(RECURSIVE_MAKE)
16 + +@target=files; $(RECURSIVE_MAKE)
17
18 links:
19 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
20 @@ -100,7 +100,7 @@
21 # lib: $(LIB): are splitted to avoid end-less loop
22 lib: $(LIB)
23 @touch lib
24 -$(LIB): $(LIBOBJ)
25 +$(LIB): $(LIBOBJ) | subdirs
26 $(AR) $(LIB) $(LIBOBJ)
27 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
28 $(RANLIB) $(LIB) || echo Never mind.
29 @@ -111,7 +111,7 @@
30 fi
31
32 libs:
33 - @target=lib; $(RECURSIVE_MAKE)
34 + +@target=lib; $(RECURSIVE_MAKE)
35
36 install:
37 @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
38 @@ -120,7 +120,7 @@
39 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
40 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
41 done;
42 - @target=install; $(RECURSIVE_MAKE)
43 + +@target=install; $(RECURSIVE_MAKE)
44
45 lint:
46 @target=lint; $(RECURSIVE_MAKE)
47 --- openssl-1.0.2d/engines/Makefile
48 +++ openssl-1.0.2d/engines/Makefile
49 @@ -72,7 +72,7 @@
50
51 all: lib subdirs
52
53 -lib: $(LIBOBJ)
54 +lib: $(LIBOBJ) | subdirs
55 @if [ -n "$(SHARED_LIBS)" ]; then \
56 set -e; \
57 for l in $(LIBNAMES); do \
58 @@ -89,7 +89,7 @@
59
60 subdirs:
61 echo $(EDIRS)
62 - @target=all; $(RECURSIVE_MAKE)
63 + +@target=all; $(RECURSIVE_MAKE)
64
65 files:
66 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
67 @@ -128,7 +128,7 @@
68 mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
69 done; \
70 fi
71 - @target=install; $(RECURSIVE_MAKE)
72 + +@target=install; $(RECURSIVE_MAKE)
73
74 tags:
75 ctags $(SRC)
76 --- openssl-1.0.2d/Makefile.org
77 +++ openssl-1.0.2d/Makefile.org
78 @@ -274,17 +274,17 @@
79 build_libs: build_crypto build_ssl build_engines
80
81 build_crypto:
82 - @dir=crypto; target=all; $(BUILD_ONE_CMD)
83 + +@dir=crypto; target=all; $(BUILD_ONE_CMD)
84 build_ssl: build_crypto
85 - @dir=ssl; target=all; $(BUILD_ONE_CMD)
86 + +@dir=ssl; target=all; $(BUILD_ONE_CMD)
87 build_engines: build_crypto
88 - @dir=engines; target=all; $(BUILD_ONE_CMD)
89 + +@dir=engines; target=all; $(BUILD_ONE_CMD)
90 build_apps: build_libs
91 - @dir=apps; target=all; $(BUILD_ONE_CMD)
92 + +@dir=apps; target=all; $(BUILD_ONE_CMD)
93 build_tests: build_libs
94 - @dir=test; target=all; $(BUILD_ONE_CMD)
95 + +@dir=test; target=all; $(BUILD_ONE_CMD)
96 build_tools: build_libs
97 - @dir=tools; target=all; $(BUILD_ONE_CMD)
98 + +@dir=tools; target=all; $(BUILD_ONE_CMD)
99
100 all_testapps: build_libs build_testapps
101 build_testapps:
102 @@ -555,7 +555,7 @@
103 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
104 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
105 done;
106 - @set -e; target=install; $(RECURSIVE_BUILD_CMD)
107 + +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
108 @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
109 do \
110 if [ -f "$$i" ]; then \
111 --- openssl-1.0.2d/Makefile.shared
112 +++ openssl-1.0.2d/Makefile.shared
113 @@ -105,6 +105,7 @@
114 SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
115 LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
116 LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
117 + [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
118 LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
119 $${SHAREDCMD} $${SHAREDFLAGS} \
120 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
121 @@ -122,6 +123,7 @@
122 done; \
123 fi; \
124 if [ -n "$$SHLIB_SOVER" ]; then \
125 + [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
126 ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
127 ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
128 fi; \
129 --- openssl-1.0.2d/test/Makefile
130 +++ openssl-1.0.2d/test/Makefile
131 @@ -133,7 +133,7 @@
132 tags:
133 ctags $(SRC)
134
135 -tests: exe apps $(TESTS)
136 +tests: exe $(TESTS)
137
138 apps:
139 @(cd ..; $(MAKE) DIRS=apps all)
140 @@ -402,121 +402,121 @@
141 link_app.$${shlib_target}
142
143 $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
144 - @target=$(RSATEST); $(BUILD_CMD)
145 + +@target=$(RSATEST); $(BUILD_CMD)
146
147 $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
148 - @target=$(BNTEST); $(BUILD_CMD)
149 + +@target=$(BNTEST); $(BUILD_CMD)
150
151 $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
152 - @target=$(ECTEST); $(BUILD_CMD)
153 + +@target=$(ECTEST); $(BUILD_CMD)
154
155 $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
156 - @target=$(EXPTEST); $(BUILD_CMD)
157 + +@target=$(EXPTEST); $(BUILD_CMD)
158
159 $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
160 - @target=$(IDEATEST); $(BUILD_CMD)
161 + +@target=$(IDEATEST); $(BUILD_CMD)
162
163 $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
164 - @target=$(MD2TEST); $(BUILD_CMD)
165 + +@target=$(MD2TEST); $(BUILD_CMD)
166
167 $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
168 - @target=$(SHATEST); $(BUILD_CMD)
169 + +@target=$(SHATEST); $(BUILD_CMD)
170
171 $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
172 - @target=$(SHA1TEST); $(BUILD_CMD)
173 + +@target=$(SHA1TEST); $(BUILD_CMD)
174
175 $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
176 - @target=$(SHA256TEST); $(BUILD_CMD)
177 + +@target=$(SHA256TEST); $(BUILD_CMD)
178
179 $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
180 - @target=$(SHA512TEST); $(BUILD_CMD)
181 + +@target=$(SHA512TEST); $(BUILD_CMD)
182
183 $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
184 - @target=$(RMDTEST); $(BUILD_CMD)
185 + +@target=$(RMDTEST); $(BUILD_CMD)
186
187 $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
188 - @target=$(MDC2TEST); $(BUILD_CMD)
189 + +@target=$(MDC2TEST); $(BUILD_CMD)
190
191 $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
192 - @target=$(MD4TEST); $(BUILD_CMD)
193 + +@target=$(MD4TEST); $(BUILD_CMD)
194
195 $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
196 - @target=$(MD5TEST); $(BUILD_CMD)
197 + +@target=$(MD5TEST); $(BUILD_CMD)
198
199 $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
200 - @target=$(HMACTEST); $(BUILD_CMD)
201 + +@target=$(HMACTEST); $(BUILD_CMD)
202
203 $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
204 - @target=$(WPTEST); $(BUILD_CMD)
205 + +@target=$(WPTEST); $(BUILD_CMD)
206
207 $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
208 - @target=$(RC2TEST); $(BUILD_CMD)
209 + +@target=$(RC2TEST); $(BUILD_CMD)
210
211 $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
212 - @target=$(BFTEST); $(BUILD_CMD)
213 + +@target=$(BFTEST); $(BUILD_CMD)
214
215 $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
216 - @target=$(CASTTEST); $(BUILD_CMD)
217 + +@target=$(CASTTEST); $(BUILD_CMD)
218
219 $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
220 - @target=$(RC4TEST); $(BUILD_CMD)
221 + +@target=$(RC4TEST); $(BUILD_CMD)
222
223 $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
224 - @target=$(RC5TEST); $(BUILD_CMD)
225 + +@target=$(RC5TEST); $(BUILD_CMD)
226
227 $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
228 - @target=$(DESTEST); $(BUILD_CMD)
229 + +@target=$(DESTEST); $(BUILD_CMD)
230
231 $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
232 - @target=$(RANDTEST); $(BUILD_CMD)
233 + +@target=$(RANDTEST); $(BUILD_CMD)
234
235 $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
236 - @target=$(DHTEST); $(BUILD_CMD)
237 + +@target=$(DHTEST); $(BUILD_CMD)
238
239 $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
240 - @target=$(DSATEST); $(BUILD_CMD)
241 + +@target=$(DSATEST); $(BUILD_CMD)
242
243 $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
244 - @target=$(METHTEST); $(BUILD_CMD)
245 + +@target=$(METHTEST); $(BUILD_CMD)
246
247 $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
248 - @target=$(SSLTEST); $(FIPS_BUILD_CMD)
249 + +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
250
251 $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
252 - @target=$(ENGINETEST); $(BUILD_CMD)
253 + +@target=$(ENGINETEST); $(BUILD_CMD)
254
255 $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
256 - @target=$(EVPTEST); $(BUILD_CMD)
257 + +@target=$(EVPTEST); $(BUILD_CMD)
258
259 $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
260 - @target=$(EVPEXTRATEST); $(BUILD_CMD)
261 + +@target=$(EVPEXTRATEST); $(BUILD_CMD)
262
263 $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
264 - @target=$(ECDSATEST); $(BUILD_CMD)
265 + +@target=$(ECDSATEST); $(BUILD_CMD)
266
267 $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
268 - @target=$(ECDHTEST); $(BUILD_CMD)
269 + +@target=$(ECDHTEST); $(BUILD_CMD)
270
271 $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
272 - @target=$(IGETEST); $(BUILD_CMD)
273 + +@target=$(IGETEST); $(BUILD_CMD)
274
275 $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
276 - @target=$(JPAKETEST); $(BUILD_CMD)
277 + +@target=$(JPAKETEST); $(BUILD_CMD)
278
279 $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
280 - @target=$(ASN1TEST); $(BUILD_CMD)
281 + +@target=$(ASN1TEST); $(BUILD_CMD)
282
283 $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
284 - @target=$(SRPTEST); $(BUILD_CMD)
285 + +@target=$(SRPTEST); $(BUILD_CMD)
286
287 $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
288 - @target=$(V3NAMETEST); $(BUILD_CMD)
289 + +@target=$(V3NAMETEST); $(BUILD_CMD)
290
291 $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
292 - @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
293 + +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
294
295 $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
296 - @target=$(CONSTTIMETEST) $(BUILD_CMD)
297 + +@target=$(CONSTTIMETEST) $(BUILD_CMD)
298
299 #$(AESTEST).o: $(AESTEST).c
300 # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
301 @@ -529,7 +529,7 @@
302 # fi
303
304 dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
305 - @target=dummytest; $(BUILD_CMD)
306 + +@target=dummytest; $(BUILD_CMD)
307
308 # DO NOT DELETE THIS LINE -- make depend depends on it.
309
|
