zstd: bump version.

2026-04-22 03:30:05 +02:00 · 2020-05-22 16:50:20 +02:00
parent b52803cfa4
commit 45f4aa3d9e
3 changed files with 76 additions and 18 deletions
--- a/app-arch/zstd/patches/zstd-1.4.5-gcc2.patchset
+++ b/app-arch/zstd/patches/zstd-1.4.5-gcc2.patchset
@@ -1,17 +1,17 @@
-From f5b2d80f7e83b4410d97602c4f85bfa5878d91cc Mon Sep 17 00:00:00 2001
+From 2fe47af9772d8a751f0efe4aa75a83f418f5a3ab Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 28 Mar 2018 16:51:49 +0000
 Subject: Drop gcc options unknown to gcc2.


 diff --git a/lib/Makefile b/lib/Makefile
-index 87a396c..d1dbe83 100644
+index 7c6dff0..f562ae6 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -24,10 +24,10 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
+@@ -35,10 +35,10 @@ CPPFLAGS+= -DXXH_NAMESPACE=ZSTD_
+ ifeq ($(TARGET_SYSTEM),Windows_NT)   # MinGW assumed
 CPPFLAGS   += -D__USE_MINGW_ANSI_STDIO   # compatibility with %zu formatting
 endif
- CFLAGS  ?= -O3
 -DEBUGFLAGS= -Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
 +DEBUGFLAGS= -Wall          -Wcast-qual -Wcast-align -Wshadow \
             -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
@@ -21,7 +21,7 @@ index 87a396c..d1dbe83 100644
             -Wredundant-decls -Wmissing-prototypes -Wc++-compat
 CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
 FLAGS    = $(CPPFLAGS) $(CFLAGS)
-@@ -166,7 +166,7 @@ $(LIBZSTD): $(ZSTD_FILES)
+@@ -204,7 +204,7 @@ $(LIBZSTD): $(ZSTD_FILES)
 else
 
 LIBZSTD = libzstd.$(SHARED_EXT_VER)
@@ -29,12 +29,12 @@ index 87a396c..d1dbe83 100644
 +$(LIBZSTD): LDFLAGS += -shared -fPIC
 $(LIBZSTD): $(ZSTD_FILES)
 	@echo compiling dynamic library $(LIBVER)
- 	@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
+ 	$(Q)$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 diff --git a/programs/Makefile b/programs/Makefile
-index 64dcae0..6adf081 100644
+index 418ad4e..f413fe0 100644
 --- a/programs/Makefile
 +++ b/programs/Makefile
-@@ -49,10 +49,10 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
+@@ -48,10 +48,10 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
 CPPFLAGS   += -D__USE_MINGW_ANSI_STDIO   # compatibility with %zu formatting
 endif
 CFLAGS  ?= -O3
@@ -48,20 +48,20 @@ index 64dcae0..6adf081 100644
 CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
 FLAGS    = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 -- 
-2.21.0
+2.24.0


-From bf78b65e9775e0418d0c8b78b12503da6eb5927a Mon Sep 17 00:00:00 2001
+From 5a875715d5e58fc257f8661fb3751280c0854157 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Mon, 29 Oct 2018 19:39:46 +0000
 Subject: Remove "-Werror" from MOREFLAGS to fix "make test" with gcc2.


 diff --git a/Makefile b/Makefile
-index f2ec8c9..82dfca0 100644
+index 2c1d346..ff1cf6d 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -65,7 +65,7 @@ zlibwrapper: lib
+@@ -75,7 +75,7 @@ zlibwrapper: lib
 ## test: run long-duration tests
 .PHONY: test
 DEBUGLEVEL ?= 1
@@ -71,20 +71,20 @@ index f2ec8c9..82dfca0 100644
 	MOREFLAGS="$(MOREFLAGS)" $(MAKE) -j -C $(PRGDIR) allVariants
 	$(MAKE) -C $(TESTDIR) $@
 -- 
-2.21.0
+2.24.0


-From 95daf183bd126fc0b1c74e53d0529ba98b9e56ee Mon Sep 17 00:00:00 2001
+From 26ade9ffb085e6d158febfe1cc45441957954df5 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Tue, 30 Oct 2018 11:07:16 +0000
 Subject: Drop gcc options unknown to gcc2 in tests/Makefile.


 diff --git a/tests/Makefile b/tests/Makefile
-index bd2f909..e1d14da 100644
+index d347a94..b388642 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -31,10 +31,10 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
+@@ -32,10 +32,10 @@ ifeq ($(OS),Windows_NT)   # MinGW assumed
 CPPFLAGS   += -D__USE_MINGW_ANSI_STDIO   # compatibility with %zu formatting
 endif
 CFLAGS     ?= -O3
@@ -98,5 +98,63 @@ index bd2f909..e1d14da 100644
 CFLAGS     += $(DEBUGFLAGS) $(MOREFLAGS)
 FLAGS       = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
 -- 
-2.21.0
+2.24.0

+
+From c4d44669d6801adf7a1e255b81819346725ffe4a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 22 May 2020 16:40:27 +0200
+Subject: Haiku: older GCCs don't support some pragmas and builtins.
+
+
+diff --git a/lib/common/compiler.h b/lib/common/compiler.h
+index 95e9483..8d6110d 100644
+--- a/lib/common/compiler.h
+++ b/lib/common/compiler.h
+@@ -139,7 +139,7 @@
+ 
+ /* vectorization
+  * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */
+-#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__)
+#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 3)
+ #  if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5)
+ #    define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
+ #  else
+@@ -154,7 +154,7 @@
+  * If you can remove a LIKELY/UNLIKELY annotation without speed changes in gcc
+  * and clang, please do.
+  */
+-#if defined(__GNUC__)
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+ #define LIKELY(x) (__builtin_expect((x), 1))
+ #define UNLIKELY(x) (__builtin_expect((x), 0))
+ #else
+-- 
+2.24.0
+
+
+From 628a21607747ef5c8eb8a30a3b7f7aeb94388ca1 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Fri, 22 May 2020 16:48:49 +0200
+Subject: remove gcc options unsupported by gcc2
+
+
+diff --git a/lib/Makefile b/lib/Makefile
+index f562ae6..0f0a1d8 100644
+--- a/lib/Makefile
+++ b/lib/Makefile
+@@ -36,10 +36,9 @@ ifeq ($(TARGET_SYSTEM),Windows_NT)   # MinGW assumed
+ CPPFLAGS   += -D__USE_MINGW_ANSI_STDIO   # compatibility with %zu formatting
+ endif
+ DEBUGFLAGS= -Wall          -Wcast-qual -Wcast-align -Wshadow \
+-            -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
+             -Wstrict-prototypes -Wundef -Wpointer-arith \
+-            -Wvla -Wformat=2                           -Wwrite-strings \
+-            -Wredundant-decls -Wmissing-prototypes -Wc++-compat
+                  -Wformat=2                           -Wwrite-strings \
+            -Wredundant-decls -Wmissing-prototypes
+ CFLAGS  += $(DEBUGFLAGS) $(MOREFLAGS)
+ FLAGS    = $(CPPFLAGS) $(CFLAGS)
+ 
+-- 
+2.24.0
--- a/app-arch/zstd/patches/zstd-1.4.5.patchset
+++ b/app-arch/zstd/patches/zstd-1.4.5.patchset
--- a/app-arch/zstd/zstd-1.4.5.recipe
+++ b/app-arch/zstd/zstd-1.4.5.recipe
@@ -14,7 +14,7 @@ LICENSE="BSD (2-clause)
 REVISION="1"
 SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="zstd-$portVersion.tar.gz"
-CHECKSUM_SHA256="a364f5162c7d1a455cc915e8e3cf5f4bd8b75d09bc0f53965b0c9ca1383c52c8"
+CHECKSUM_SHA256="734d1f565c42f691f8420c8d06783ad818060fc390dee43ae0a89f86d0a4f8c2"
 PATCHES="zstd-$portVersion.patchset"
 if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
 PATCHES="$PATCHES