[med-svn] [libzstd] 05/07: address embedded zlib

[Sascha Steinbiss]

This is an automated email from the git hooks/post-receive script.

satta pushed a commit to branch master
in repository libzstd.

commit 3842889b98dacbbf9269f0d2b93ebfb4984a4922
Author: Sascha Steinbiss <satta at debian.org>
Date:   Fri Jan 13 14:11:01 2017 +0000

    address embedded zlib
---
 debian/patches/0008-Address-embedded-zlib.patch | 45 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/0008-Address-embedded-zlib.patch b/debian/patches/0008-Address-embedded-zlib.patch
new file mode 100644
index 0000000..87a81cb
--- /dev/null
+++ b/debian/patches/0008-Address-embedded-zlib.patch
@@ -0,0 +1,45 @@
+Description: Fix use of fprintf
+Author: Sascha Steinbiss <satta at 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
+@@ -67,16 +67,16 @@
+ #.c.o:
+ #	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+-minigzip: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
++minigzip: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY)
+ 	$(CC) $(LDFLAGS) $^ $(ZSTDLIBRARY) $(ZLIB_LIBRARY) -o $@
+ 
+-minigzip_zstd: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
++minigzip_zstd: $(EXAMPLE_PATH)/minigzip.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
+ 	$(CC) $(LDFLAGS) $^ $(ZSTDLIBRARY) $(ZLIB_LIBRARY) -o $@
+ 
+-example: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
++example: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstd_zlibwrapper.o $(ZSTDLIBRARY)
+ 	$(CC) $(LDFLAGS) $^ $(ZLIB_LIBRARY) -o $@
+ 
+-example_zstd: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(GZFILES) $(ZSTDLIBRARY)
++example_zstd: $(EXAMPLE_PATH)/example.o $(ZLIBWRAPPER_PATH)/zstdTurnedOn_zlibwrapper.o $(ZSTDLIBRARY)
+ 	$(CC) $(LDFLAGS) $^ $(ZLIB_LIBRARY) -o $@
+ 
+ fitblk: $(EXAMPLE_PATH)/fitblk.o $(ZLIBWRAPPER_PATH)/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
diff --git a/debian/patches/series b/debian/patches/series
index 4d49bc2..b76b057 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Ensure-CPPFLAGS-makes-it-to-the-compiler.patch
 0006-Use-bash-for-test-script-portablitity.patch
 0007-Fix-use-of-fprintf.patch
+0008-Address-embedded-zlib.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libzstd.git