Fossil SCM

Carry forward [368d97869b] to the zlib 1.3 update. (The upstream ticket for [368d97869b] is commented as "Incorporated" and closed, see [https://github.com/madler/zlib/issues/684], but doesn't seem to have landed in the zlib release package.)

florian 2023-08-20 10:00 zlib-update
Commit d8f4247b13dfab8b1f5dd2fb97c48a914080a2ad731e382798fcc5e86a5f5fbc
Parent 65583e5b74f0a60…
1 file changed +15 -15
~ compat/zlib/Makefile.in
M compat/zlib/Makefile.in
+15 -15
--- compat/zlib/Makefile.in
+++ compat/zlib/Makefile.in
@@ -198,81 +198,81 @@
198198
 $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
199199
200200
201201
 adler32.lo: $(SRCDIR)adler32.c
202202
 -@mkdir objs 2>/dev/null || test -d objs
203
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
203
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
204204
 -@mv objs/adler32.o $@
205205
206206
 crc32.lo: $(SRCDIR)crc32.c
207207
 -@mkdir objs 2>/dev/null || test -d objs
208
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
208
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
209209
 -@mv objs/crc32.o $@
210210
211211
 deflate.lo: $(SRCDIR)deflate.c
212212
 -@mkdir objs 2>/dev/null || test -d objs
213
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
213
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
214214
 -@mv objs/deflate.o $@
215215
216216
 infback.lo: $(SRCDIR)infback.c
217217
 -@mkdir objs 2>/dev/null || test -d objs
218
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
218
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/infback.o $(SRCDIR)infback.c
219219
 -@mv objs/infback.o $@
220220
221221
 inffast.lo: $(SRCDIR)inffast.c
222222
 -@mkdir objs 2>/dev/null || test -d objs
223
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
223
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
224224
 -@mv objs/inffast.o $@
225225
226226
 inflate.lo: $(SRCDIR)inflate.c
227227
 -@mkdir objs 2>/dev/null || test -d objs
228
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
228
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
229229
 -@mv objs/inflate.o $@
230230
231231
 inftrees.lo: $(SRCDIR)inftrees.c
232232
 -@mkdir objs 2>/dev/null || test -d objs
233
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
233
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
234234
 -@mv objs/inftrees.o $@
235235
236236
 trees.lo: $(SRCDIR)trees.c
237237
 -@mkdir objs 2>/dev/null || test -d objs
238
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
238
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/trees.o $(SRCDIR)trees.c
239239
 -@mv objs/trees.o $@
240240
241241
 zutil.lo: $(SRCDIR)zutil.c
242242
 -@mkdir objs 2>/dev/null || test -d objs
243
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
243
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
244244
 -@mv objs/zutil.o $@
245245
246246
 compress.lo: $(SRCDIR)compress.c
247247
 -@mkdir objs 2>/dev/null || test -d objs
248
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
248
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/compress.o $(SRCDIR)compress.c
249249
 -@mv objs/compress.o $@
250250
251251
 uncompr.lo: $(SRCDIR)uncompr.c
252252
 -@mkdir objs 2>/dev/null || test -d objs
253
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
253
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
254254
 -@mv objs/uncompr.o $@
255255
256256
 gzclose.lo: $(SRCDIR)gzclose.c
257257
 -@mkdir objs 2>/dev/null || test -d objs
258
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
258
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
259259
 -@mv objs/gzclose.o $@
260260
261261
 gzlib.lo: $(SRCDIR)gzlib.c
262262
 -@mkdir objs 2>/dev/null || test -d objs
263
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
263
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
264264
 -@mv objs/gzlib.o $@
265265
266266
 gzread.lo: $(SRCDIR)gzread.c
267267
 -@mkdir objs 2>/dev/null || test -d objs
268
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
268
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
269269
 -@mv objs/gzread.o $@
270270
271271
 gzwrite.lo: $(SRCDIR)gzwrite.c
272272
 -@mkdir objs 2>/dev/null || test -d objs
273
- $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
273
+ $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
274274
 -@mv objs/gzwrite.o $@
275275
276276
277277
 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
278278
 $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
279279
--- compat/zlib/Makefile.in
+++ compat/zlib/Makefile.in
@@ -198,81 +198,81 @@
198 $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
199
200
201 adler32.lo: $(SRCDIR)adler32.c
202 -@mkdir objs 2>/dev/null || test -d objs
203 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
204 -@mv objs/adler32.o $@
205
206 crc32.lo: $(SRCDIR)crc32.c
207 -@mkdir objs 2>/dev/null || test -d objs
208 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
209 -@mv objs/crc32.o $@
210
211 deflate.lo: $(SRCDIR)deflate.c
212 -@mkdir objs 2>/dev/null || test -d objs
213 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
214 -@mv objs/deflate.o $@
215
216 infback.lo: $(SRCDIR)infback.c
217 -@mkdir objs 2>/dev/null || test -d objs
218 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
219 -@mv objs/infback.o $@
220
221 inffast.lo: $(SRCDIR)inffast.c
222 -@mkdir objs 2>/dev/null || test -d objs
223 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
224 -@mv objs/inffast.o $@
225
226 inflate.lo: $(SRCDIR)inflate.c
227 -@mkdir objs 2>/dev/null || test -d objs
228 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
229 -@mv objs/inflate.o $@
230
231 inftrees.lo: $(SRCDIR)inftrees.c
232 -@mkdir objs 2>/dev/null || test -d objs
233 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
234 -@mv objs/inftrees.o $@
235
236 trees.lo: $(SRCDIR)trees.c
237 -@mkdir objs 2>/dev/null || test -d objs
238 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
239 -@mv objs/trees.o $@
240
241 zutil.lo: $(SRCDIR)zutil.c
242 -@mkdir objs 2>/dev/null || test -d objs
243 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
244 -@mv objs/zutil.o $@
245
246 compress.lo: $(SRCDIR)compress.c
247 -@mkdir objs 2>/dev/null || test -d objs
248 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
249 -@mv objs/compress.o $@
250
251 uncompr.lo: $(SRCDIR)uncompr.c
252 -@mkdir objs 2>/dev/null || test -d objs
253 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
254 -@mv objs/uncompr.o $@
255
256 gzclose.lo: $(SRCDIR)gzclose.c
257 -@mkdir objs 2>/dev/null || test -d objs
258 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
259 -@mv objs/gzclose.o $@
260
261 gzlib.lo: $(SRCDIR)gzlib.c
262 -@mkdir objs 2>/dev/null || test -d objs
263 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
264 -@mv objs/gzlib.o $@
265
266 gzread.lo: $(SRCDIR)gzread.c
267 -@mkdir objs 2>/dev/null || test -d objs
268 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
269 -@mv objs/gzread.o $@
270
271 gzwrite.lo: $(SRCDIR)gzwrite.c
272 -@mkdir objs 2>/dev/null || test -d objs
273 $(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
274 -@mv objs/gzwrite.o $@
275
276
277 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
278 $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
279
--- compat/zlib/Makefile.in
+++ compat/zlib/Makefile.in
@@ -198,81 +198,81 @@
198 $(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
199
200
201 adler32.lo: $(SRCDIR)adler32.c
202 -@mkdir objs 2>/dev/null || test -d objs
203 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
204 -@mv objs/adler32.o $@
205
206 crc32.lo: $(SRCDIR)crc32.c
207 -@mkdir objs 2>/dev/null || test -d objs
208 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
209 -@mv objs/crc32.o $@
210
211 deflate.lo: $(SRCDIR)deflate.c
212 -@mkdir objs 2>/dev/null || test -d objs
213 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
214 -@mv objs/deflate.o $@
215
216 infback.lo: $(SRCDIR)infback.c
217 -@mkdir objs 2>/dev/null || test -d objs
218 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/infback.o $(SRCDIR)infback.c
219 -@mv objs/infback.o $@
220
221 inffast.lo: $(SRCDIR)inffast.c
222 -@mkdir objs 2>/dev/null || test -d objs
223 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
224 -@mv objs/inffast.o $@
225
226 inflate.lo: $(SRCDIR)inflate.c
227 -@mkdir objs 2>/dev/null || test -d objs
228 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
229 -@mv objs/inflate.o $@
230
231 inftrees.lo: $(SRCDIR)inftrees.c
232 -@mkdir objs 2>/dev/null || test -d objs
233 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
234 -@mv objs/inftrees.o $@
235
236 trees.lo: $(SRCDIR)trees.c
237 -@mkdir objs 2>/dev/null || test -d objs
238 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/trees.o $(SRCDIR)trees.c
239 -@mv objs/trees.o $@
240
241 zutil.lo: $(SRCDIR)zutil.c
242 -@mkdir objs 2>/dev/null || test -d objs
243 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
244 -@mv objs/zutil.o $@
245
246 compress.lo: $(SRCDIR)compress.c
247 -@mkdir objs 2>/dev/null || test -d objs
248 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/compress.o $(SRCDIR)compress.c
249 -@mv objs/compress.o $@
250
251 uncompr.lo: $(SRCDIR)uncompr.c
252 -@mkdir objs 2>/dev/null || test -d objs
253 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
254 -@mv objs/uncompr.o $@
255
256 gzclose.lo: $(SRCDIR)gzclose.c
257 -@mkdir objs 2>/dev/null || test -d objs
258 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
259 -@mv objs/gzclose.o $@
260
261 gzlib.lo: $(SRCDIR)gzlib.c
262 -@mkdir objs 2>/dev/null || test -d objs
263 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
264 -@mv objs/gzlib.o $@
265
266 gzread.lo: $(SRCDIR)gzread.c
267 -@mkdir objs 2>/dev/null || test -d objs
268 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
269 -@mv objs/gzread.o $@
270
271 gzwrite.lo: $(SRCDIR)gzwrite.c
272 -@mkdir objs 2>/dev/null || test -d objs
273 $(CC) $(SFLAGS) $(ZINC) -fPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
274 -@mv objs/gzwrite.o $@
275
276
277 placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
278 $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
279

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button