ZlibNG: Update to 2.1.6 (JuliaPackaging#8007)

* ZlibNG: Update to 2.1.6 * ZlibNG: Correct build error on Power
Moelf · Jul 1, 2024 · 2915ecb · 2915ecb
1 parent 1eef686
commit 2915ecb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/Z/ZlibNG/build_tarballs.jl b/Z/ZlibNG/build_tarballs.jl
@@ -3,16 +3,19 @@
 using BinaryBuilder, Pkg
 
 name = "ZlibNG"
-version = v"2.1.0"
+version = v"2.1.6"
 
 # Collection of sources required to complete build
 sources = [
-    GitSource("https://github.com/zlib-ng/zlib-ng.git", "b3dcf11b4204a16fde71fa8224d7b7054e225b93")
+    GitSource("https://github.com/zlib-ng/zlib-ng.git", "74253725f884e2424a0dd8ae3f69896d5377f325"),
+    DirectorySource("bundled"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/zlib-ng
+# Correct Power build (see <https://github.com/zlib-ng/zlib-ng/issues/1648>)
+atomic_patch -p1 ${WORKSPACE}/srcdir/patches/power.patch
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX=$prefix \
     -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \

diff --git a/Z/ZlibNG/bundled/patches/power.patch b/Z/ZlibNG/bundled/patches/power.patch
@@ -0,0 +1,12 @@
+diff --git a/arch/power/power_features.c b/arch/power/power_features.c
+index 35145177..a5c0a470 100644
+--- a/arch/power/power_features.c
++++ b/arch/power/power_features.c
+@@ -7,6 +7,7 @@
+ #ifdef HAVE_SYS_AUXV_H
+ #  include <sys/auxv.h>
+ #endif
++#include <linux/auxvec.h>
+ #ifdef __FreeBSD__
+ #  include <machine/cpu.h>
+ #endif