SerenityOS/serenity
1
0 Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2026-11-07 04:29:30 -10:00
Code Issues Packages Projects Releases Wiki Activity

Ports: Update xz to 5.8.4

Browse Source
This commit is contained in:
Linus Groh authored and Nico Weber committed 2026-09-30 21:42:57 -07:00
1 parent 859fee2bac
commit 9e83d4e12e
6 files changed
+38 -100
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Ports/AvailablePorts.md
+1 -1
View File
@@ -367,7 +367,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.12.26 | https://github.com/FWGS/xash3d-fwgs |
| [`xmp-cli`](xmp-cli/) | Extended Module Player | 4.2.0 | https://github.com/libxmp/xmp-cli |
| [`xorriso`](xorriso/) | xorriso | 1.5.6 | https://www.gnu.org/software/xorriso |
| [`xz`](xz/) | xz | 5.8.1 | https://tukaani.org/xz/ |
| [`xz`](xz/) | xz | 5.8.4 | https://tukaani.org/xz/ |
| [`yasm`](yasm/) | Yasm Modular Assembler | 1.3.0 | https://yasm.tortall.net/ |
| [`zig`](zig/) | Zig programming language | 0.16.0 | https://ziglang.org/ |
| [`zlib`](zlib/) | zlib | 1.3.2 | https://www.zlib.net/ |
Ports/xz/package.sh
+2 -6
View File
@@ -1,18 +1,14 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='xz'
version='5.8.1'
version='5.8.4'
depends=(
'libiconv'
'zlib'
)
files=(
"https://tukaani.org/xz/xz-${version}.tar.gz#507825b599356c10dca1cd720c9d0d0c9d5400b9de300af00e4d1ea150795543"
"https://tukaani.org/xz/xz-${version}.tar.gz#0014c7886930454fe8bd4228665b51af55eeae560ea135c9c4cd33f55b2591d9"
)
useconfigure='true'
use_fresh_config_sub='true'
config_sub_paths=(
'build-aux/config.sub'
)
configopts=(
'--disable-static'
'--enable-shared'
Ports/xz/patches/0001-Remove-unsupported-RLIM_SAVED_-usage.patch
+24
View File
@@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Linus Groh <[email protected]>
Date: Wed, 30 Sep 2026 07:40:02 +0100
Subject: [PATCH] Remove unsupported RLIM_SAVED_* usage
---
src/xz/hardware.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/xz/hardware.c b/src/xz/hardware.c
index 3a1a709f1181838e0e053821a7a065aa426fe346..83614221a18c2ed0e1f2700489d30b28fc1a7ec4 100644
--- a/src/xz/hardware.c
+++ b/src/xz/hardware.c
@@ -367,9 +367,7 @@ hardware_init(void)
// as no limit at all.
struct rlimit rl;
if (getrlimit(resources[i], &rl) == 0
- && rl.rlim_cur != RLIM_INFINITY
- && rl.rlim_cur != RLIM_SAVED_CUR
- && rl.rlim_cur != RLIM_SAVED_MAX) {
+ && rl.rlim_cur != RLIM_INFINITY) {
#ifdef __clang__
# pragma GCC diagnostic pop
#endif
Ports/xz/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch
-73
View File
@@ -1,73 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <[email protected]>
Date: Sun, 29 May 2022 15:01:28 +0200
Subject: [PATCH] libtool: Enable shared library support for SerenityOS
For some odd reason, libtool handles the configuration for shared
libraries entirely statically and in its configure script. If no
shared library support is "present", building shared libraries is
disabled entirely.
Fix that by just adding the appropriate configuration options for
`serenity`. This allows us to finally create dynamic libraries
automatically using libtool, without having to manually link the
static library into a shared library.
---
configure | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/configure b/configure
index 4f89118495be24a8a5e228ad6ff00a6da9d58f9d..8849cd1ad50ec1015b0bcbd7bdce9d18e74e111f 100755
--- a/configure
+++ b/configure
@@ -10032,6 +10032,10 @@ tpf*)
os2*)
lt_cv_deplibs_check_method=pass_all
;;
+
+serenity*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
;;
esac
@@ -13663,6 +13667,10 @@ lt_prog_compiler_static=
lt_prog_compiler_static='-Bstatic'
;;
+ serenity*)
+ lt_prog_compiler_can_build_shared=yes
+ ;;
+
*)
lt_prog_compiler_can_build_shared=no
;;
@@ -15216,6 +15224,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
hardcode_shlibpath_var=no
;;
+ serenity*)
+ ld_shlibs=yes
+ ;;
+
*)
ld_shlibs=no
;;
@@ -16362,6 +16374,17 @@ uts4*)
shlibpath_var=LD_LIBRARY_PATH
;;
+serenity*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}${versuffix} ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}${major}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ dynamic_linker='SerenityOS LibELF'
+ ;;
+
emscripten*)
version_type=none
need_lib_prefix=no
Ports/xz/patches/0002-liblzma-Don-t-assume-getauxval-is-Linux-only.patch
+9 -9
View File
@@ -11,28 +11,28 @@ in the auxiliary vector.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/liblzma/check/crc32_arm64.h b/src/liblzma/check/crc32_arm64.h
index fb0e8f0105a9e7ddf5abb3a8f8ef3bb2b48ab128..32072922d6b8e3cee8705d0169a1d083c8e08ad6 100644
index 4a0818f173004fa85dcf489135f8eec6c0e30f02..54f2bd307bff4eb45893f41fb9923867a7a61e76 100644
--- a/src/liblzma/check/crc32_arm64.h
+++ b/src/liblzma/check/crc32_arm64.h
@@ -103,7 +103,7 @@ crc32_arch_optimized(const uint8_t *buf, size_t size, uint32_t crc)
@@ -108,7 +108,7 @@ crc32_arch_optimized(const uint8_t *buf, size_t size, uint32_t crc)
static inline bool
is_arch_extension_supported(void)
{
-#if defined(HAVE_GETAUXVAL)
+#if defined(__linux__) && defined(HAVE_GETAUXVAL)
-#if defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)
+#if defined(__linux__) && defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)
return (getauxval(AT_HWCAP) & HWCAP_CRC32) != 0;
#elif defined(HAVE_ELF_AUX_INFO)
diff --git a/src/liblzma/check/crc_common.h b/src/liblzma/check/crc_common.h
index 7ea1e60b043bf86dfe421e7594cb01812c51caa0..30a7b5c1a8f4185d76c926c3b41a5488b72ce6ed 100644
index 4897dfee49ae02e509eaac7d2dbb60192c53b114..0770e9386d4cd5d860cb596dbd37e86f81804c6b 100644
--- a/src/liblzma/check/crc_common.h
+++ b/src/liblzma/check/crc_common.h
@@ -89,7 +89,7 @@ extern const uint64_t lzma_crc64_table[4][256];
// ARM64
@@ -90,7 +90,7 @@ extern const uint64_t lzma_crc64_table[4][256];
//
// Keep this in sync with changes to crc32_arm64.h
-#if defined(_WIN32) || defined(HAVE_GETAUXVAL) \
+#if defined(_WIN32) || (defined(__linux__) && defined(HAVE_GETAUXVAL)) \
#if defined(_WIN32) \
- || (defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)) \
+ || (defined(__linux__) && defined(HAVE_GETAUXVAL) && defined(HAVE_HWCAP_CRC32)) \
|| defined(HAVE_ELF_AUX_INFO) \
|| (defined(__APPLE__) && defined(HAVE_SYSCTLBYNAME))
# define CRC_ARM64_RUNTIME_DETECTION 1
Ports/xz/patches/ReadMe.md
+2 -11
View File
@@ -1,18 +1,9 @@
# Patches for xz on SerenityOS
## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch`
## `0001-Remove-unsupported-RLIM_SAVED_-usage.patch`
libtool: Enable shared library support for SerenityOS
Remove unsupported RLIM_SAVED_* usage
For some odd reason, libtool handles the configuration for shared
libraries entirely statically and in its configure script. If no
shared library support is "present", building shared libraries is
disabled entirely.
Fix that by just adding the appropriate configuration options for
`serenity`. This allows us to finally create dynamic libraries
automatically using libtool, without having to manually link the
static library into a shared library.
## `0002-liblzma-Don-t-assume-getauxval-is-Linux-only.patch`