From deeadf14494086884e5c1cb935c29269d5996bd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:58:18 +0000 Subject: [PATCH] build: sync with upstream 2024-08-19 https://github.com/void-linux/void-packages/commit/b243e694 --- common/build-style/meson.sh | 6 ++-- common/environment/build-style/meson.sh | 2 ++ common/shlibs | 48 ++++++++++++------------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index 5ea2eed..67b9dc1 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -20,7 +20,7 @@ do_configure() { export AR="gcc-ar" # unbuffered output for continuous logging - PYTHONUNBUFFERED=1 ${meson_cmd} setup \ + ${meson_cmd} setup \ --prefix=/usr \ --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \ --libexecdir=/usr/libexec \ @@ -51,11 +51,11 @@ do_build() { } do_check() { - : ${make_cmd:=ninja} + : ${make_cmd:=meson} : ${make_check_target:=test} : ${meson_builddir:=build} - ${make_check_pre} ${make_cmd} -C ${meson_builddir} ${makejobs} ${make_check_args} ${make_check_target} + ${make_check_pre} ${make_cmd} ${make_check_target} -C ${meson_builddir} ${makejobs} ${make_check_args} } do_install() { diff --git a/common/environment/build-style/meson.sh b/common/environment/build-style/meson.sh index dbfe937..61b70ed 100644 --- a/common/environment/build-style/meson.sh +++ b/common/environment/build-style/meson.sh @@ -1,2 +1,4 @@ hostmakedepends+=" meson" build_helper+=" meson" + +export PYTHONUNBUFFERED=1 diff --git a/common/shlibs b/common/shlibs index 4b2660a..20dd99b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3233,30 +3233,30 @@ libsqstdlib.so.0 squirrel-libs-3.1_1 libexecinfo.so.1 libexecinfo-1.1_1 libkpmcore.so.12 kpmcore-22.04.1_1 libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6 -libr_core.so.5.9.2 radare2-5.9.2_1 -libr_config.so.5.9.2 radare2-5.9.2_1 -libr_cons.so.5.9.2 radare2-5.9.2_1 -libr_util.so.5.9.2 radare2-5.9.2_1 -libr_flag.so.5.9.2 radare2-5.9.2_1 -libr_arch.so.5.9.2 radare2-5.9.2_1 -libr_asm.so.5.9.2 radare2-5.9.2_1 -libr_bin.so.5.9.2 radare2-5.9.2_1 -libr_anal.so.5.9.2 radare2-5.9.2_1 -libr_lang.so.5.9.2 radare2-5.9.2_1 -libr_debug.so.5.9.2 radare2-5.9.2_1 -libr_egg.so.5.9.2 radare2-5.9.2_1 -libr_bp.so.5.9.2 radare2-5.9.2_1 -libr_search.so.5.9.2 radare2-5.9.2_1 -libr_io.so.5.9.2 radare2-5.9.2_1 -libr_hash.so.5.9.2 radare2-5.9.2_1 -libr_socket.so.5.9.2 radare2-5.9.2_1 -libr_parse.so.5.9.2 radare2-5.9.2_1 -libr_syscall.so.5.9.2 radare2-5.9.2_1 -libr_crypto.so.5.9.2 radare2-5.9.2_1 -libr_fs.so.5.9.2 radare2-5.9.2_1 -libr_magic.so.5.9.2 radare2-5.9.2_1 -libr_reg.so.5.9.2 radare2-5.9.2_1 -libr_main.so.5.9.2 radare2-5.9.2_1 +libr_core.so.5.9.4 radare2-5.9.4_1 +libr_config.so.5.9.4 radare2-5.9.4_1 +libr_cons.so.5.9.4 radare2-5.9.4_1 +libr_util.so.5.9.4 radare2-5.9.4_1 +libr_flag.so.5.9.4 radare2-5.9.4_1 +libr_arch.so.5.9.4 radare2-5.9.4_1 +libr_asm.so.5.9.4 radare2-5.9.4_1 +libr_bin.so.5.9.4 radare2-5.9.4_1 +libr_anal.so.5.9.4 radare2-5.9.4_1 +libr_lang.so.5.9.4 radare2-5.9.4_1 +libr_debug.so.5.9.4 radare2-5.9.4_1 +libr_egg.so.5.9.4 radare2-5.9.4_1 +libr_bp.so.5.9.4 radare2-5.9.4_1 +libr_search.so.5.9.4 radare2-5.9.4_1 +libr_io.so.5.9.4 radare2-5.9.4_1 +libr_hash.so.5.9.4 radare2-5.9.4_1 +libr_socket.so.5.9.4 radare2-5.9.4_1 +libr_parse.so.5.9.4 radare2-5.9.4_1 +libr_syscall.so.5.9.4 radare2-5.9.4_1 +libr_crypto.so.5.9.4 radare2-5.9.4_1 +libr_fs.so.5.9.4 radare2-5.9.4_1 +libr_magic.so.5.9.4 radare2-5.9.4_1 +libr_reg.so.5.9.4 radare2-5.9.4_1 +libr_main.so.5.9.4 radare2-5.9.4_1 libykpiv.so.2 libykpiv-2.3.0_1 libykcs11.so.2 libykcs11-2.3.0_1 libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1