From e65052a208e35b99ee4d34eedc0e704e4559e99d Mon Sep 17 00:00:00 2001 From: Luke Wilde Date: Sat, 8 Jan 2022 02:03:11 +0000 Subject: [PATCH] Ports: Update zstd port to version 1.5.1 --- Ports/AvailablePorts.md | 2 +- Ports/zstd/package.sh | 4 ++-- Ports/zstd/patches/fix_soname_flags.patch | 17 +++++++++++------ Ports/zstd/patches/posix-compliance.patch | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 0824f713a6..45db5e189b 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -191,4 +191,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.5.0 | https://facebook.github.io/zstd/ | +| [`zstd`](zstd/) | Zstandard | 1.5.1 | https://facebook.github.io/zstd/ | diff --git a/Ports/zstd/package.sh b/Ports/zstd/package.sh index 149e2fe82e..63433b1432 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.5.0 -files="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz zstd-${version}.tar.gz 5194fbfa781fcf45b98c5e849651aa7b3b0a008c6b72d4a0db760f3002291e94" +version=1.5.1 +files="https://github.com/facebook/zstd/releases/download/v${version}/zstd-${version}.tar.gz zstd-${version}.tar.gz e28b2f2ed5710ea0d3a1ecac3f6a947a016b972b9dd30242369010e5f53d7002" auth_type=sha256 diff --git a/Ports/zstd/patches/fix_soname_flags.patch b/Ports/zstd/patches/fix_soname_flags.patch index 1839f3ef0b..92a239f4f0 100644 --- a/Ports/zstd/patches/fix_soname_flags.patch +++ b/Ports/zstd/patches/fix_soname_flags.patch @@ -1,6 +1,6 @@ ---- zstd-1.5.0/lib/Makefile.orig 2021-05-14 16:59:34.000000000 +0200 -+++ zstd-1.5.0/lib/Makefile 2021-11-01 16:24:07.000000000 +0100 -@@ -206,17 +206,10 @@ +--- zstd-1.5.1/lib/Makefile.orig 2022-01-08 01:21:29.874503163 +0000 ++++ zstd-1.5.1/lib/Makefile 2022-01-08 01:21:43.026368517 +0000 +@@ -69,22 +69,10 @@ # macOS linker doesn't support -soname, and use different extension # see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html @@ -10,15 +10,20 @@ - SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT) - SONAME_FLAGS = -install_name $(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER) -else -- SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) +- ifeq ($(UNAME), AIX) +- SONAME_FLAGS = +- else +- SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) +- endif - SHARED_EXT = so - SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) - SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) -endif +- +SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR) +SHARED_EXT = so +SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR) +SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) - SET_CACHE_DIRECTORY = \ - +$(MAKE) --no-print-directory $@ \ + .PHONY: all + all: lib diff --git a/Ports/zstd/patches/posix-compliance.patch b/Ports/zstd/patches/posix-compliance.patch index f97a59c594..e6444876d4 100644 --- a/Ports/zstd/patches/posix-compliance.patch +++ b/Ports/zstd/patches/posix-compliance.patch @@ -1,6 +1,6 @@ ---- zstd-1.4.4/programs/platform.h.orig Sat Mar 14 15:22:06 2020 -+++ zstd-1.4.4/programs/platform.h Sat Mar 14 15:22:41 2020 -@@ -97,7 +97,11 @@ +--- zstd-1.5.1/programs/platform.h.orig 2022-01-08 01:30:53.468728340 +0000 ++++ zstd-1.5.1/programs/platform.h 2022-01-08 01:31:01.480646197 +0000 +@@ -98,7 +98,11 @@ # endif # include /* declares _POSIX_VERSION */ # if defined(_POSIX_VERSION) /* POSIX compliant */