Skip to content

Commit

Permalink
zlib: Update to 1.3.1
Browse files Browse the repository at this point in the history
Signed-off-by: Masanori Ogino <[email protected]>
  • Loading branch information
omasanori committed Jan 29, 2024
1 parent f6ded10 commit 9860436
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 30 deletions.
Binary file modified z/zlib/manifest.x86_64.bin
Binary file not shown.
8 changes: 4 additions & 4 deletions z/zlib/manifest.x86_64.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"files": [
"/usr/lib/libz.so.1",
"/usr/lib/libz.so.1.3"
"/usr/lib/libz.so.1.3.1"
],
"name": "zlib",
"provides": [
Expand All @@ -21,7 +21,7 @@
],
"files": [
"/usr/lib32/libz.so.1",
"/usr/lib32/libz.so.1.3"
"/usr/lib32/libz.so.1.3.1"
],
"name": "zlib-32bit",
"provides": [
Expand Down Expand Up @@ -53,6 +53,6 @@
}
},
"source-name": "zlib",
"source-release": "9",
"source-version": "1.3"
"source-release": "10",
"source-version": "1.3.1"
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
From e931f465e92faf11781f50a0b7c77d9970492153 Mon Sep 17 00:00:00 2001
From: Peter O'Connor <[email protected]>
Date: Mon, 23 May 2022 19:02:28 +1000
Subject: [PATCH] Drop useless shared lib check
* Remove an useless test in configure
* Respect ${AR}, ${CC} and ${RANLIB} in Makefile

Originally written by Peter O'Connor.

Signed-off-by: Peter O'Connor <[email protected]>
---
configure | 19 -------------------
1 file changed, 19 deletions(-)

diff --git a/configure b/configure
index 52ff4a0..facfe42 100755
--- a/configure
+++ b/configure
@@ -418,25 +418,6 @@ fi
diff -ru zlib-1.3.1.orig/configure zlib-1.3.1/configure
--- zlib-1.3.1.orig/configure 2024-01-21 11:29:31.000000000 +0900
+++ zlib-1.3.1/configure 2024-01-28 18:07:13.089250431 +0900
@@ -434,25 +434,6 @@

echo >> configure.log

Expand All @@ -24,7 +20,7 @@ index 52ff4a0..facfe42 100755
-if test $shared -eq 1; then
- echo Checking for shared library support... | tee -a configure.log
- # we must test in two steps (cc then ld), required at least on SunOS 4.x
- if try $CC -w -c $SFLAGS $test.c &&
- if try $CC -c $SFLAGS $test.c &&
- try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
- echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log
- elif test -z "$old_cc" -a -z "$old_cflags"; then
Expand All @@ -38,14 +34,10 @@ index 52ff4a0..facfe42 100755
if test $shared -eq 0; then
LDSHARED="$CC"
ALL="static"
--
2.36.1

diff --git a/Makefile.in b/Makefile.in
index 3d858aa..2413373 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
diff -ru zlib-1.3.1.orig/Makefile.in zlib-1.3.1/Makefile.in
--- zlib-1.3.1.orig/Makefile.in 2024-01-23 03:32:37.000000000 +0900
+++ zlib-1.3.1/Makefile.in 2024-01-28 18:05:40.725650461 +0900
@@ -12,7 +12,7 @@
# To install in $HOME instead of /usr/local, use:
# make install prefix=$HOME

Expand All @@ -54,7 +46,7 @@ index 3d858aa..2413373 100644

CFLAGS=-O
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
@@ -36,9 +36,9 @@ SHAREDLIBV=libz.so.1.2.12
@@ -32,9 +32,9 @@
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIBV)

Expand Down
8 changes: 4 additions & 4 deletions z/zlib/stone.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name : zlib
version : 1.3
release : 9
version : 1.3.1
release : 10
summary : Library implementing the DEFLATE compression algorithm
license : Zlib
homepage : https://zlib.net/
description : |
Library implementing the DEFLATE compression algorithm
upstreams :
- https://zlib.net/fossils/zlib-1.3.tar.gz: ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
- https://zlib.net/fossils/zlib-1.3.1.tar.gz: 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
emul32 : yes
setup : |
%patch %(pkgdir)/serpent/0001-Drop-useless-shared-lib-check.patch
%patch %(pkgdir)/serpent/zlib-1.3.1-fix-build.patch
CC=${CC} ./configure --prefix=/usr \
--libdir=%(libdir) \
--enable-shared
Expand Down

0 comments on commit 9860436

Please sign in to comment.