File: 0008-Address-embedded-zlib.patch

package info (click to toggle)
libzstd 1.5.7%2Bdfsg-1.1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 10,352 kB
  • sloc: ansic: 89,030; sh: 3,788; python: 3,466; cpp: 2,927; makefile: 2,329; asm: 390
file content (43 lines) | stat: -rw-r--r-- 1,424 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Description: Do not build zlibWrapper examples against embedded code copies.
Author: Sascha Steinbiss <satta@debian.org>
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -13,7 +13,7 @@
 ZSTDLIBDIR = ../lib
 ZSTDLIBRARY = $(ZSTDLIBDIR)/libzstd.a
 ZLIBWRAPPER_PATH = .
-GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o
+#GZFILES = gzclose.o gzlib.o gzread.o gzwrite.o
 EXAMPLE_PATH = examples
 PROGRAMS_PATH = ../programs
 TEST_FILE = ../doc/zstd_compression_format.md
@@ -83,14 +83,14 @@
 #.c.o:
 #	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
 
-minigzip: minigzip.o zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+minigzip: minigzip.o zstd_zlibwrapper.o $(ZSTDLIBRARY)
 
-minigzip_zstd: minigzip.o zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+minigzip_zstd: minigzip.o zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
 	$(LINK.o) $^ $(LDLIBS) $(OUTPUT_OPTION)
 
-example: example.o zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+example: example.o zstd_zlibwrapper.o $(ZSTDLIBRARY)
 
-example_zstd: example.o zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
+example_zstd: example.o zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
 	$(LINK.o) $^ $(LDLIBS) $(OUTPUT_OPTION)
 
 fitblk: fitblk.o zstd_zlibwrapper.o $(ZSTDLIBRARY)
--- a/zlibWrapper/examples/example.c
+++ b/zlibWrapper/examples/example.c
@@ -27,7 +27,7 @@
 
 /* @(#) $Id$ */
 
-#include "zstd_zlibwrapper.h"
+#include "zlib.h"
 #include <stdio.h>
 
 #ifdef STDC