Skip to content

Commit 2915ecb

Browse files
eschnettgrasph
authored andcommitted
ZlibNG: Update to 2.1.6 (JuliaPackaging#8007)
* ZlibNG: Update to 2.1.6 * ZlibNG: Correct build error on Power
1 parent 1eef686 commit 2915ecb

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Z/ZlibNG/build_tarballs.jl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
using BinaryBuilder, Pkg
44

55
name = "ZlibNG"
6-
version = v"2.1.0"
6+
version = v"2.1.6"
77

88
# Collection of sources required to complete build
99
sources = [
10-
GitSource("https://github.com/zlib-ng/zlib-ng.git", "b3dcf11b4204a16fde71fa8224d7b7054e225b93")
10+
GitSource("https://github.com/zlib-ng/zlib-ng.git", "74253725f884e2424a0dd8ae3f69896d5377f325"),
11+
DirectorySource("bundled"),
1112
]
1213

1314
# Bash recipe for building across all platforms
1415
script = raw"""
1516
cd $WORKSPACE/srcdir/zlib-ng
17+
# Correct Power build (see <https://github.com/zlib-ng/zlib-ng/issues/1648>)
18+
atomic_patch -p1 ${WORKSPACE}/srcdir/patches/power.patch
1619
mkdir build && cd build
1720
cmake -DCMAKE_INSTALL_PREFIX=$prefix \
1821
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \

Z/ZlibNG/bundled/patches/power.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/arch/power/power_features.c b/arch/power/power_features.c
2+
index 35145177..a5c0a470 100644
3+
--- a/arch/power/power_features.c
4+
+++ b/arch/power/power_features.c
5+
@@ -7,6 +7,7 @@
6+
#ifdef HAVE_SYS_AUXV_H
7+
# include <sys/auxv.h>
8+
#endif
9+
+#include <linux/auxvec.h>
10+
#ifdef __FreeBSD__
11+
# include <machine/cpu.h>
12+
#endif

0 commit comments

Comments
 (0)