1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 15:30:47 +00:00

Ports/zlib: Update to 1.2.13

This commit is contained in:
cflip 2022-10-13 23:15:47 -06:00 committed by Linus Groh
parent 99cd6f66cf
commit 30be638fb2
4 changed files with 3 additions and 40 deletions

View File

@ -257,6 +257,6 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.07.14 | https://github.com/FWGS/xash3d-fwgs |
| [`xz`](xz/) | xz | 5.2.5 | https://tukaani.org/xz/ |
| [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ |
| [`zlib`](zlib/) | zlib | 1.2.12 | https://www.zlib.net/ |
| [`zlib`](zlib/) | zlib | 1.2.13 | https://www.zlib.net/ |
| [`zsh`](zsh/) | Z Shell (Zsh) | 5.8.1 | https://www.zsh.org |
| [`zstd`](zstd/) | Zstandard | 1.5.2 | https://facebook.github.io/zstd/ |

View File

@ -1,8 +1,8 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=zlib
version=1.2.12
version=1.2.13
useconfigure=true
files="https://www.zlib.net/zlib-${version}.tar.gz zlib-${version}.tar.gz 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9"
files="https://www.zlib.net/zlib-${version}.tar.gz zlib-${version}.tar.gz b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30"
auth_type="sha256"
configure() {

View File

@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Mon, 28 Mar 2022 18:34:10 -0700
Subject: [PATCH] Fix configure issue that discarded provided CC definition.
Backports an upstream fix for a bug that caused the host compiler to be
used for linking even though the cross-compiler was specified in the
`CC` environment variable.
---
configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
index 52ff4a0..3fa3e86 100755
--- a/configure
+++ b/configure
@@ -174,7 +174,10 @@ if test -z "$CC"; then
else
cc=${CROSS_PREFIX}cc
fi
+else
+ cc=${CC}
fi
+
cflags=${CFLAGS-"-O3"}
# to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
case "$cc" in

View File

@ -1,10 +0,0 @@
# Patches for zlib on SerenityOS
## `0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch`
Fix configure issue that discarded provided CC definition.
Backports an upstream fix for a bug that caused the host compiler to be
used for linking even though the cross-compiler was specified in the
`CC` environment variable.