mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 07:51:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/zlib-ng: bump to 2.2.4

Browse Source 
Remove patch that is included upstream now.
License hash changed due to copyright year update [1].

Release Notes: https://github.com/zlib-ng/zlib-ng/releases

[1] fc63426372

Signed-off-by: Marcus Hoffmann <buildroot@bubu1.eu>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Marcus Hoffmann
2025-03-18 12:36:45 +01:00
committed by Julien Olivain
parent 2248c732c6
commit ba8bce8a11
3 changed files with 3 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
package/zlib-ng/0001-arch-riscv-riscv-features-c-fix-uclibc-build.patch
View File

@@ -1,51 +0,0 @@
From 3f35bfccff2d1dacdfe9844712be1e042d028700 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 17 Mar 2024 21:56:53 +0100
Subject: [PATCH] arch/riscv/riscv_features.c: fix uclibc build
Fix the following uclibc build failure raised since version 2.1.4 and
https://github.com/zlib-ng/zlib-ng/commit/6ff8b52cefe56a824fae1d53fdd687bcde2e53c9:
/home/autobuild/autobuild/instance-2/output-1/build/zlib-ng-2.1.6/arch/riscv/riscv_features.c:4:10: fatal error: sys/auxv.h: No such file or directory
4 | #include <sys/auxv.h>
| ^~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/06a7d8e59ec4de7c711d3f4a4624f67b97d78afe
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Upstream: https://github.com/zlib-ng/zlib-ng/commit/3f35bfccff2d1dacdfe9844712be1e042d028700
---
arch/riscv/riscv_features.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/riscv/riscv_features.c b/arch/riscv/riscv_features.c
index 506b480c11..1e3f45e0a7 100644
--- a/arch/riscv/riscv_features.c
+++ b/arch/riscv/riscv_features.c
@@ -1,9 +1,12 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/auxv.h>
#include <sys/utsname.h>
+#if defined(__linux__) && defined(HAVE_SYS_AUXV_H)
+# include <sys/auxv.h>
+#endif
+
#include "../../zbuild.h"
#include "riscv_features.h"
@@ -33,7 +36,11 @@ void Z_INTERNAL riscv_check_features_compile_time(struct riscv_cpu_features *fea
}
void Z_INTERNAL riscv_check_features_runtime(struct riscv_cpu_features *features) {
+#if defined(__linux__) && defined(HAVE_SYS_AUXV_H)
unsigned long hw_cap = getauxval(AT_HWCAP);
+#else
+ unsigned long hw_cap = 0;
+#endif
features->has_rvv = hw_cap & ISA_V_HWCAP;
}

4
package/zlib-ng/zlib-ng.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz
sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md
sha256 a73343c3093e5cdc50d9377997c3815b878fd110bf6511c2c7759f2afb90f5a3 zlib-ng-2.2.4.tar.gz
sha256 6c9f0d975b41afaa34d22f55bb8986ce69e5cb7ad327cb2b28820cd425edf5ee LICENSE.md

2
package/zlib-ng/zlib-ng.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
ZLIB_NG_VERSION = 2.1.6
ZLIB_NG_VERSION = 2.2.4
ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION))
ZLIB_NG_LICENSE = Zlib
ZLIB_NG_LICENSE_FILES = LICENSE.md