snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

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.
This commit is contained in:
Đoàn Trần Công Danh 2021-01-23 14:16:13 +07:00
parent 2b2a862374
commit 32e2827145
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/hooks/pre-configure/02-script-wrapper.sh
View File

@ -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}