[med-svn] [libzstd] 05/06: Adapt patches to new upstream version; Removed 0011-reduce_nbthreads_max_for_32bit_mips.patch since upstream decreased ZSTDMT_NBTHREADS_MAX in general

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libzstd.

commit a014cd7f3da840740f19dcbcf0afcd4df960b9c4
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 9 08:05:31 2017 +0100

    Adapt patches to new upstream version; Removed 0011-reduce_nbthreads_max_for_32bit_mips.patch since upstream decreased ZSTDMT_NBTHREADS_MAX in general
---
 debian/patches/0010-do_not_make_examples.patch        |  8 ++++----
 .../0011-reduce_nbthreads_max_for_32bit_mips.patch    | 19 -------------------
 debian/patches/series                                 |  1 -
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/debian/patches/0010-do_not_make_examples.patch b/debian/patches/0010-do_not_make_examples.patch
index 8cb1f69..081d6ea 100644
--- a/debian/patches/0010-do_not_make_examples.patch
+++ b/debian/patches/0010-do_not_make_examples.patch
@@ -6,7 +6,7 @@ Descriptions: examples needed to be removed from upstream tarball - do not try t
 
 --- a/Makefile
 +++ b/Makefile
-@@ -26,7 +26,7 @@ endif
+@@ -27,7 +27,7 @@ endif
  default: lib-release zstd-release
  
  .PHONY: all
@@ -14,12 +14,12 @@ Descriptions: examples needed to be removed from upstream tarball - do not try t
 +all: | allmost manual
  
  .PHONY: allmost
- allmost:
-@@ -97,7 +97,6 @@ clean:
+ allmost: allzstd
+@@ -95,7 +95,6 @@ clean:
  	@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
  	@$(MAKE) -C $(TESTDIR) $@ > $(VOID)
  	@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
 -	@$(MAKE) -C examples/ $@ > $(VOID)
  	@$(MAKE) -C contrib/gen_html $@ > $(VOID)
  	@$(RM) zstd$(EXT) zstdmt$(EXT) tmp*
- 	@echo Cleaning completed
+ 	@$(RM) -r lz4
diff --git a/debian/patches/0011-reduce_nbthreads_max_for_32bit_mips.patch b/debian/patches/0011-reduce_nbthreads_max_for_32bit_mips.patch
deleted file mode 100644
index 3f28726..0000000
--- a/debian/patches/0011-reduce_nbthreads_max_for_32bit_mips.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: James Cowgill <jcowgill at jcowgill.uk>
-Last-Update: Fri, 22 Sep 2017 11:16:52 +0100
-Bug-Debian: https://bugs.debian.org/876416
-Description: Reduce number of threads for 32 bit MIPS architecture
-
---- a/lib/compress/zstdmt_compress.c
-+++ b/lib/compress/zstdmt_compress.c
-@@ -9,7 +9,11 @@
- 
- 
- /* ======   Tuning parameters   ====== */
-+#if defined(__mips__) && !defined(__mips64)
-+#define ZSTDMT_NBTHREADS_MAX 248
-+#else
- #define ZSTDMT_NBTHREADS_MAX 256
-+#endif
- #define ZSTDMT_OVERLAPLOG_DEFAULT 6
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 5add101..e43cf25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@
 0008-Address-embedded-zlib.patch
 0009-Add-shebang-for-scripts.patch
 0010-do_not_make_examples.patch
-0011-reduce_nbthreads_max_for_32bit_mips.patch

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