Zstd: New version 1.5.7 (#10577)

* Zstd: New version 1.5.7

* Zstd: Add musl work-around

Author: eschnett

Z/Zstd/build_tarballs.jl

@@ -1,21 +1,28 @@
 using BinaryBuilder
 
 name = "Zstd"
-upstream_version = v"1.5.6"
-version = v"1.5.7" # need to change version to change compat bounds, but in the future we can go back to follow upstream
+version = v"1.5.7"
 
 sources = [
-    ArchiveSource("https://github.com/facebook/zstd/releases/download/v$(upstream_version)/zstd-$(upstream_version).tar.gz",
-                  "8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1"),
+    ArchiveSource("https://github.com/facebook/zstd/releases/download/v$(version)/zstd-$(version).tar.gz",
+                  "eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3"),
+    DirectorySource("bundled"),
 ]
 
 script = raw"""
 cd ${WORKSPACE}/srcdir/zstd-*
+
+# zstd uses `qsort_r` which is not available from musl <https://github.com/facebook/zstd/issues/4311>.
+atomic_patch -p1 $WORKSPACE/srcdir/patches/qsort_r.patch
+
 mkdir build-zstd && cd build-zstd
 
 if [[ "${target}" == *86*-linux-gnu ]]; then
     # Using `clock_gettime` on old Glibc requires linking to `librt`.
     sed -ri "s/^c_link_args = \[(.*)\]/c_link_args = [\1, '-lrt']/" ${MESON_TARGET_TOOLCHAIN}
+elif [[ "${target}" == *musl* ]]; then
+    # Define `__MUSL__` for the patch `qsort_r.patch`
+    sed -ri "s/^c_args = \[(.*)\]/c_args = [\1, '-D__MUSL__']/" ${MESON_TARGET_TOOLCHAIN}
 elif [[ "${target}" == i686-*-mingw* ]]; then
     # Using `WakeConditionVariable`/`InitializeConditionVariable`/`SleepConditionVariableCS`
     # require Windows Vista:
@@ -46,5 +53,3 @@ dependencies = Dependency[]
 
 build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
                clang_use_lld=false, julia_compat="1.6")
-
-# Build Trigger: 2

Z/Zstd/bundled/patches/qsort_r.patch

@@ -0,0 +1,26 @@
+diff --git a/lib/common/zstd_deps.h b/lib/common/zstd_deps.h
+index 8a9c7cc5..c6cb2aea 100644
+--- a/lib/common/zstd_deps.h
++++ b/lib/common/zstd_deps.h
+@@ -31,7 +31,7 @@
+  */
+ #if defined(__linux) || defined(__linux__) || defined(linux) || defined(__gnu_linux__) || \
+     defined(__CYGWIN__) || defined(__MSYS__)
+-#if !defined(_GNU_SOURCE) && !defined(__ANDROID__) /* NDK doesn't ship qsort_r(). */
++#if !defined(_GNU_SOURCE) && !defined(__ANDROID__) && !defined(__MUSL__) /* NDK and musl don't ship qsort_r(). */
+ #define _GNU_SOURCE
+ #endif
+ #endif
+diff --git a/lib/dictBuilder/cover.c b/lib/dictBuilder/cover.c
+index 2ef33c73..39e3a972 100644
+--- a/lib/dictBuilder/cover.c
++++ b/lib/dictBuilder/cover.c
+@@ -24,7 +24,7 @@
+ /* qsort_r is an extension. */
+ #if defined(__linux) || defined(__linux__) || defined(linux) || defined(__gnu_linux__) || \
+     defined(__CYGWIN__) || defined(__MSYS__)
+-#if !defined(_GNU_SOURCE) && !defined(__ANDROID__) /* NDK doesn't ship qsort_r(). */
++#if !defined(_GNU_SOURCE) && !defined(__ANDROID__) && !defined(__MUSL__) /* NDK and musl don't ship qsort_r(). */
+ #define _GNU_SOURCE
+ #endif
+ #endif