diff options
author | Denys Dmytriyenko <denis@denix.org> | 2024-02-15 13:54:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-16 15:14:26 +0000 |
commit | c3b895e94301f23181d1f87e8013867920587cd9 (patch) | |
tree | 51fd798077f242030e278c8761622e74d4720447 /meta/recipes-core/zlib | |
parent | 37aa0e077ad319dd0000a48a23db64fac1cbd4dc (diff) | |
download | poky-c3b895e94301f23181d1f87e8013867920587cd9.tar.gz |
zlib: upgrade 1.3 -> 1.3.1
Refresh local patch.
Changelog:
https://github.com/madler/zlib/releases/tag/v1.3.1
(From OE-Core rev: 186475e244d9622817b5a50e83cbfe1e4ed78e34)
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/zlib')
-rw-r--r-- | meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch | 22 | ||||
-rw-r--r-- | meta/recipes-core/zlib/zlib_1.3.1.bb (renamed from meta/recipes-core/zlib/zlib_1.3.bb) | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch index e6cc915ba5..07b2cd3879 100644 --- a/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch +++ b/meta/recipes-core/zlib/zlib/0001-configure-Pass-LDFLAGS-to-link-tests.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] | 1 | Upstream-Status: Submitted [https://github.com/madler/zlib/pull/599] |
2 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 2 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
3 | 3 | ||
4 | From f15584918a7fbbe3cc794ad59100e5e8153ea9f6 Mon Sep 17 00:00:00 2001 | 4 | From ea77f1f003a4d18b23cca703f3c824942863a1b4 Mon Sep 17 00:00:00 2001 |
5 | From: Khem Raj <raj.khem@gmail.com> | 5 | From: Khem Raj <raj.khem@gmail.com> |
6 | Date: Tue, 8 Mar 2022 22:38:47 -0800 | 6 | Date: Tue, 8 Mar 2022 22:38:47 -0800 |
7 | Subject: [PATCH] configure: Pass LDFLAGS to link tests | 7 | Subject: [PATCH] configure: Pass LDFLAGS to link tests |
@@ -13,24 +13,25 @@ tests perform correctly. Without this some tests may fail resulting in | |||
13 | wrong confgure result, ending in miscompiling the package | 13 | wrong confgure result, ending in miscompiling the package |
14 | 14 | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
16 | |||
16 | --- | 17 | --- |
17 | configure | 12 ++++++------ | 18 | configure | 12 ++++++------ |
18 | 1 file changed, 6 insertions(+), 6 deletions(-) | 19 | 1 file changed, 6 insertions(+), 6 deletions(-) |
19 | 20 | ||
20 | diff --git a/configure b/configure | 21 | diff --git a/configure b/configure |
21 | index 52ff4a0..d04ee59 100755 | 22 | index c55098a..a7c6d72 100755 |
22 | --- a/configure | 23 | --- a/configure |
23 | +++ b/configure | 24 | +++ b/configure |
24 | @@ -427,7 +427,7 @@ if test $shared -eq 1; then | 25 | @@ -443,7 +443,7 @@ if test $shared -eq 1; then |
25 | echo Checking for shared library support... | tee -a configure.log | 26 | echo Checking for shared library support... | tee -a configure.log |
26 | # we must test in two steps (cc then ld), required at least on SunOS 4.x | 27 | # we must test in two steps (cc then ld), required at least on SunOS 4.x |
27 | if try $CC -w -c $SFLAGS $test.c && | 28 | if try $CC -c $SFLAGS $test.c && |
28 | - try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then | 29 | - try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then |
29 | + try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then | 30 | + try $LDSHARED $SFLAGS $LDFLAGS -o $test$shared_ext $test.o; then |
30 | echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log | 31 | echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log |
31 | elif test -z "$old_cc" -a -z "$old_cflags"; then | 32 | elif test -z "$old_cc" -a -z "$old_cflags"; then |
32 | echo No shared library support. | tee -a configure.log | 33 | echo No shared library support. | tee -a configure.log |
33 | @@ -503,7 +503,7 @@ int main(void) { | 34 | @@ -505,7 +505,7 @@ int main(void) { |
34 | } | 35 | } |
35 | EOF | 36 | EOF |
36 | fi | 37 | fi |
@@ -39,7 +40,7 @@ index 52ff4a0..d04ee59 100755 | |||
39 | sizet=`./$test` | 40 | sizet=`./$test` |
40 | echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log | 41 | echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log |
41 | CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" | 42 | CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" |
42 | @@ -537,7 +537,7 @@ int main(void) { | 43 | @@ -539,7 +539,7 @@ int main(void) { |
43 | return 0; | 44 | return 0; |
44 | } | 45 | } |
45 | EOF | 46 | EOF |
@@ -48,7 +49,7 @@ index 52ff4a0..d04ee59 100755 | |||
48 | echo "Checking for fseeko... Yes." | tee -a configure.log | 49 | echo "Checking for fseeko... Yes." | tee -a configure.log |
49 | else | 50 | else |
50 | CFLAGS="${CFLAGS} -DNO_FSEEKO" | 51 | CFLAGS="${CFLAGS} -DNO_FSEEKO" |
51 | @@ -554,7 +554,7 @@ cat > $test.c <<EOF | 52 | @@ -556,7 +556,7 @@ cat > $test.c <<EOF |
52 | #include <errno.h> | 53 | #include <errno.h> |
53 | int main() { return strlen(strerror(errno)); } | 54 | int main() { return strlen(strerror(errno)); } |
54 | EOF | 55 | EOF |
@@ -57,7 +58,7 @@ index 52ff4a0..d04ee59 100755 | |||
57 | echo "Checking for strerror... Yes." | tee -a configure.log | 58 | echo "Checking for strerror... Yes." | tee -a configure.log |
58 | else | 59 | else |
59 | CFLAGS="${CFLAGS} -DNO_STRERROR" | 60 | CFLAGS="${CFLAGS} -DNO_STRERROR" |
60 | @@ -661,7 +661,7 @@ int main() | 61 | @@ -663,7 +663,7 @@ int main() |
61 | return (mytest("Hello%d\n", 1)); | 62 | return (mytest("Hello%d\n", 1)); |
62 | } | 63 | } |
63 | EOF | 64 | EOF |
@@ -66,7 +67,7 @@ index 52ff4a0..d04ee59 100755 | |||
66 | echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log | 67 | echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log |
67 | 68 | ||
68 | echo >> configure.log | 69 | echo >> configure.log |
69 | @@ -751,7 +751,7 @@ int main() | 70 | @@ -753,7 +753,7 @@ int main() |
70 | } | 71 | } |
71 | EOF | 72 | EOF |
72 | 73 | ||
@@ -75,6 +76,3 @@ index 52ff4a0..d04ee59 100755 | |||
75 | echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log | 76 | echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log |
76 | 77 | ||
77 | echo >> configure.log | 78 | echo >> configure.log |
78 | -- | ||
79 | 2.25.1 | ||
80 | |||
diff --git a/meta/recipes-core/zlib/zlib_1.3.bb b/meta/recipes-core/zlib/zlib_1.3.1.bb index ede75f90bd..e6a81ef789 100644 --- a/meta/recipes-core/zlib/zlib_1.3.bb +++ b/meta/recipes-core/zlib/zlib_1.3.1.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "https://zlib.net/${BP}.tar.gz \ | |||
13 | " | 13 | " |
14 | UPSTREAM_CHECK_URI = "http://zlib.net/" | 14 | UPSTREAM_CHECK_URI = "http://zlib.net/" |
15 | 15 | ||
16 | SRC_URI[sha256sum] = "ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e" | 16 | SRC_URI[sha256sum] = "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23" |
17 | 17 | ||
18 | # When a new release is made the previous release is moved to fossils/, so add this | 18 | # When a new release is made the previous release is moved to fossils/, so add this |
19 | # to PREMIRRORS so it is also searched automatically. | 19 | # to PREMIRRORS so it is also searched automatically. |