zstd 1.5.5 (revert from 1.5.6, which disappeared)

curl · Mar 30, 2024 · cf8f096 · cf8f096
1 parent e7ffcee
commit cf8f096
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/_versions.sh b/_versions.sh
@@ -56,8 +56,8 @@ export ZLIBNG_VER_='2.1.6'
 export ZLIBNG_HASH=a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2
 export ZLIB_VER_='1.3.1'
 export ZLIB_HASH=38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
-export ZSTD_VER_='1.5.6'
-export ZSTD_HASH=8c29e06cf42aacc1eafc4077ae2ec6c6fcb96a626157e0593d5e82a34fd403c1
+export ZSTD_VER_='1.5.5'
+export ZSTD_HASH=9c4396cc829cfae319a6e2615202e82aad41372073482fce286fac78646d3ee4
 export LLVM_MINGW_LINUX_AARCH64_VER_='20240320'
 export LLVM_MINGW_LINUX_AARCH64_HASH=85f62dffa67a1713a67743397b91e84446bbc08b6a2a3844e1a9aec7199abb16
 export LLVM_MINGW_LINUX_X86_64_VER_='20240320'

diff --git a/zstd.sh b/zstd.sh
@@ -23,6 +23,11 @@ _VER="$1"
  CPPFLAGS+=' -DZSTDERRORLIB_VISIBLE='
  fi
 
+ # Fixed in upstream dev: https://github.com/facebook/zstd/commit/b1a30e2b4a69e6fcca9c2a6f9d4e43e8e3b243c8
+ if [ "${_OS}" = 'mac' ] && [ "${ZSTD_VER_}" = '1.5.5' ]; then
+ CPPFLAGS+=' -Dglobal=private_extern'
+ fi
+
  # shellcheck disable=SC2086
  cmake build/cmake -B "${_BLDDIR}" ${_CMAKE_GLOBAL} ${_CMAKE_CXX_GLOBAL} \
  '-DZSTD_BUILD_CONTRIB=OFF' \