From 3a8c423447b391873e206ba2185a0ea0189a6ef4 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Mon, 1 Nov 2021 15:17:29 +0100 Subject: [PATCH] Ports: Update zstd to version 1.5.0 --- Ports/AvailablePorts.md | 2 +- Ports/zstd/package.sh | 4 +-- Ports/zstd/patches/make-4.3.patch | 43 ------------------------------- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 Ports/zstd/patches/make-4.3.patch diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 39736698e7e..4bf6d56b175 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -178,4 +178,4 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ | | [`zlib`](zlib/) | zlib | 1.2.11 | https://www.zlib.net/ | | [`zsh`](zsh/) | Z Shell (Zsh) | 5.8 | https://www.zsh.org | -| [`zstd`](zstd/) | Zstandard | 1.4.4 | https://facebook.github.io/zstd/ | +| [`zstd`](zstd/) | Zstandard | 1.5.0 | https://facebook.github.io/zstd/ | diff --git a/Ports/zstd/package.sh b/Ports/zstd/package.sh index 945eb39e8ce..149e2fe82eb 100755 --- a/Ports/zstd/package.sh +++ b/Ports/zstd/package.sh @@ -1,5 +1,5 @@ #!/usr/bin/env -S bash ../.port_include.sh port=zstd -version=1.4.4 -files="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz zstd-${version}.tar.gz 59ef70ebb757ffe74a7b3fe9c305e2ba3350021a918d168a046c6300aeea9315" +version=1.5.0 +files="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz zstd-${version}.tar.gz 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94" auth_type=sha256 diff --git a/Ports/zstd/patches/make-4.3.patch b/Ports/zstd/patches/make-4.3.patch deleted file mode 100644 index 26362546c18..00000000000 --- a/Ports/zstd/patches/make-4.3.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- zstd-1.4.4/programs/Makefile.orig Sat Mar 14 15:12:59 2020 -+++ zstd-1.4.4/programs/Makefile Sat Mar 14 15:14:43 2020 -@@ -94,9 +94,12 @@ - - VOID = /dev/null - -+# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/) -+NUM_SYMBOL := \# -+ - # thread detection - NO_THREAD_MSG := ==> no threads, building without multithreading support --HAVE_PTHREAD := $(shell printf '\#include \nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) -+HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c) - HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0) - ifeq ($(HAVE_THREAD), 1) - THREAD_MSG := ==> building with threading support -@@ -108,7 +111,7 @@ - - # zlib detection - NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support --HAVE_ZLIB := $(shell printf '\#include \nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) -+HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c) - ifeq ($(HAVE_ZLIB), 1) - ZLIB_MSG := ==> building zstd with .gz compression support - ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS -@@ -119,7 +122,7 @@ - - # lzma detection - NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support --HAVE_LZMA := $(shell printf '\#include \nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) -+HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include \nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c) - ifeq ($(HAVE_LZMA), 1) - LZMA_MSG := ==> building zstd with .xz/.lzma compression support - LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS -@@ -130,7 +133,7 @@ - - # lz4 detection - NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support --HAVE_LZ4 := $(shell printf '\#include \n\#include \nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) -+HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include \n\#include \nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c) - ifeq ($(HAVE_LZ4), 1) - LZ4_MSG := ==> building zstd with .lz4 compression support - LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS