From 32e2827145b7fbf29a064a4957e0a55df4397eed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 23 Jan 2021 14:16:13 +0700 Subject: [PATCH] wrapper: valac: pass --vapidir after real arguments Due to constant change in vala, some projects includes some old and pre-generated vapi in their source tree and uses that version instead of system one. Pass system vapidir after real arguments in order to prefer its bundled vapi. --- common/hooks/pre-configure/02-script-wrapper.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh index 9ca195d5a5..1cbd9df636 100644 --- a/common/hooks/pre-configure/02-script-wrapper.sh +++ b/common/hooks/pre-configure/02-script-wrapper.sh @@ -112,9 +112,10 @@ vapigen_wrapper() { cat >>${XBPS_WRAPPERDIR}/vapigen<<_EOF #!/bin/sh exec /usr/bin/vapigen \\ + "\$@" \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\ - --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@" + --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 _EOF chmod 755 ${XBPS_WRAPPERDIR}/vapigen ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-${_vala_version} @@ -134,9 +135,10 @@ valac_wrapper() { cat >>${XBPS_WRAPPERDIR}/valac<<_EOF #!/bin/sh exec /usr/bin/valac \\ + "\$@" \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala/vapi \\ --vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\ - --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@" + --girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 _EOF chmod 755 ${XBPS_WRAPPERDIR}/valac ln -sf valac ${XBPS_WRAPPERDIR}/valac-${_vala_version}