jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wrapper: bring valac and vapigen to current version

Browse source 
Current wrappers hard-coded them at 0.42 which is very long ago.
Hence, those wrappers insert a versioned vapidir that no longer exists.
The build still work because valac will look into host's versioned vapidir
instead.

Let's check the version we're having and wrap that instead of changing
the hard-coded number from time to time.
This commit is contained in:
Đoàn Trần Công Danh 2020-11-24 21:06:13 +07:00
parent 41b5c3cf8e
commit ca8b0789b9
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,35 +99,47 @@ _EOF
}
vapigen_wrapper() {
local _vala_version _file
if [ ! -x /usr/bin/vapigen ]; then
return 0
fi
[ -x ${XBPS_WRAPPERDIR}/vapigen ] && return 0
for _file in /usr/bin/vapigen-*; do
if [ -x "${_file}" ]; then
_vala_version=${_file#*-}
fi
done
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-0.42/vapi \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
--girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/vapigen
ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-0.42
ln -sf vapigen ${XBPS_WRAPPERDIR}/vapigen-${_vala_version}
}
valac_wrapper() {
local _vala_version _file
if [ ! -x /usr/bin/valac ]; then
return 0
fi
[ -x ${XBPS_WRAPPERDIR}/valac ] && return 0
for _file in /usr/bin/valac-*; do
if [ -x "${_file}" ]; then
_vala_version=${_file#*-}
fi
done
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-0.42/vapi \\
--vapidir=${XBPS_CROSS_BASE}/usr/share/vala-${_vala_version}/vapi \\
--girdir=${XBPS_CROSS_BASE}/usr/share/gir-1.0 "\$@"
_EOF
chmod 755 ${XBPS_WRAPPERDIR}/valac
ln -sf valac ${XBPS_WRAPPERDIR}/valac-0.42
ln -sf valac ${XBPS_WRAPPERDIR}/valac-${_vala_version}
}
install_wrappers() {