hyro/void-packages
1
0
Fork 0
mirror of https://github.com/xHyroM/void-packages.git synced 2024-11-24 15:21:06 +01:00
Code Issues Projects Releases Wiki Activity

build: sync with upstream 2024-11-24 https://github.com/void-linux/void-packages/commit/c01f676a

Browse source
This commit is contained in:
github-actions[bot] 2024-11-24 01:11:48 +00:00
parent 53ff50381b
commit 869bcadd37
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/build-helper/meson.sh
View file

@ -69,13 +69,13 @@ cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF
g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner' g-ir-scanner = '${XBPS_CROSS_BASE}/usr/bin/g-ir-scanner'
g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler' g-ir-compiler = '${XBPS_CROSS_BASE}/usr/bin/g-ir-compiler'
g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate' g-ir-generate = '${XBPS_CROSS_BASE}/usr/bin/g-ir-generate'
llvm-config = '/usr/bin/llvm-config' llvm-config = 'llvm-config-qemu'
cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config' cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config'
[properties] [properties]
needs_exe_wrapper = true needs_exe_wrapper = true
bindgen_clang_arguments = ['-target', '${XBPS_CROSS_TRIPLET}'] bindgen_clang_arguments = ['-target', '${XBPS_CROSS_TRIPLET}']
[host_machine] [host_machine]
system = 'linux' system = 'linux'
cpu_family = '${_MESON_CPU_FAMILY}' cpu_family = '${_MESON_CPU_FAMILY}'

2
common/build-helper/qemu.sh
View file

@ -5,7 +5,7 @@ fi
vtargetrun() { vtargetrun() {
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
"/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static" "$@" "/usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}" "$@"
else else
"$@" "$@"
fi fi

14
common/hooks/pre-configure/02-script-wrapper.sh
View file

@ -50,6 +50,19 @@ generic_wrapper3() {
chmod 755 ${XBPS_WRAPPERDIR}/${wrapper} chmod 755 ${XBPS_WRAPPERDIR}/${wrapper}
} }
qemu_wrapper() {
local wrapper="$1"
[ ! -x ${XBPS_CROSS_BASE}/usr/bin/${wrapper} ] && return 0
[ -x ${XBPS_WRAPPERDIR}/${wrapper}-qemu ] && return 0
cat >>${XBPS_WRAPPERDIR}/${wrapper}-qemu<<_EOF
#!/bin/sh
export QEMU_LD_PREFIX=${XBPS_CROSS_BASE}
exec qemu-${XBPS_TARGET_QEMU_MACHINE} ${XBPS_CROSS_BASE}/usr/bin/${wrapper} "\$@"
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/${wrapper}-qemu
}
apr_apu_wrapper() { apr_apu_wrapper() {
local wrapper="$1" local wrapper="$1"
@ -240,4 +253,5 @@ hook() {
python_wrapper python-config 2.7 python_wrapper python-config 2.7
python_wrapper python3-config 3.12 python_wrapper python3-config 3.12
apr_apu_wrapper apu-1-config apr_apu_wrapper apu-1-config
qemu_wrapper llvm-config
} }