Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wrapper: bring valac and vapigen to current version #26676

Merged
merged 1 commit into from
Nov 26, 2020
Merged

wrapper: bring valac and vapigen to current version #26676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 16 additions & 4 deletions common/hooks/pre-configure/02-script-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down