From 64d3a5c8b7edf48378065d604c545428efbe5ec1 Mon Sep 17 00:00:00 2001 From: Bananymous Date: Mon, 23 Mar 2026 18:54:57 +0200 Subject: [PATCH] ports: Update zlib 1.3.1->1.3.2 1.3.1 is no longer available at zlib.net --- ports/zlib/build.sh | 18 +++++++++++++++--- .../0001-add-soname-to-dynamic-library.patch | 12 ------------ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 ports/zlib/patches/0001-add-soname-to-dynamic-library.patch diff --git a/ports/zlib/build.sh b/ports/zlib/build.sh index 61ceca33..f47328a0 100755 --- a/ports/zlib/build.sh +++ b/ports/zlib/build.sh @@ -1,9 +1,21 @@ #!/bin/bash ../install.sh NAME='zlib' -VERSION='1.3.1' -DOWNLOAD_URL="https://www.zlib.net/zlib-$VERSION.tar.gz#9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" +VERSION='1.3.2' +DOWNLOAD_URL="https://www.zlib.net/zlib-$VERSION.tar.gz#bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16" configure() { - ./configure --prefix=/usr --uname=banan_os + cmake --fresh -B build -S . -G Ninja \ + --toolchain="$BANAN_TOOLCHAIN_DIR/Toolchain.txt" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + || exit 1 +} + +build() { + cmake --build build || exit 1 +} + +install() { + cmake --install build || exit 1 } diff --git a/ports/zlib/patches/0001-add-soname-to-dynamic-library.patch b/ports/zlib/patches/0001-add-soname-to-dynamic-library.patch deleted file mode 100644 index d9a1bc27..00000000 --- a/ports/zlib/patches/0001-add-soname-to-dynamic-library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN zlib-1.3.1/configure zlib-1.3.1-banan_os/configure ---- zlib-1.3.1/configure 2024-01-21 04:29:31.000000000 +0200 -+++ zlib-1.3.1-banan_os/configure 2025-06-27 23:48:53.039461360 +0300 -@@ -236,6 +236,8 @@ - *BSD | *bsd* | DragonFly) - LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} - LDCONFIG="ldconfig -m" ;; -+ *banan_os) -+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} ;; - CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*) - EXE='.exe' ;; - MINGW* | mingw* | *-mingw*)