From 76e84fc5c026d777a806841d14369cb95bde395d Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 6 Jan 2025 00:21:55 -0500 Subject: [PATCH] vala :/ --- ci/ciimage/gentoo/install.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ci/ciimage/gentoo/install.sh b/ci/ciimage/gentoo/install.sh index 9f5973f6307f..1c9ab839f83d 100755 --- a/ci/ciimage/gentoo/install.sh +++ b/ci/ciimage/gentoo/install.sh @@ -39,7 +39,7 @@ pkgs_stable=( dev-cpp/gtest sci-libs/hdf5 dev-qt/linguist-tools - dev-qt/qtgui:5 + dev-qt/qtwidgets:5 llvm-core/llvm dev-qt/qttools @@ -108,6 +108,12 @@ cat <<-EOF > /etc/portage/package.use/ci dev-lang/rust-bin clippy rustfmt dev-libs/boost python + # slimmed binpkg, nomesa + media-libs/libsdl2 -opengl -wayland -alsa -dbus -gles2 -udev -vulkan + # binpkg + dev-qt/qtwidgets:5 dbus gtk + media-libs/libsdl2 X + # Some of these settings are needed just to get the binpkg but # aren't negative to have anyway sys-devel/gcc ada d @@ -166,6 +172,14 @@ python3 -m pip install "${base_python_pkgs[@]}" echo "source /etc/profile" >> /ci/env_vars.sh +# For inexplicable reasons, Gentoo only packages valac as valac-$(version) so +# no software can locate it. Parse the installed version out of portage and +# export it to meson. +VALAC=$(portageq best_version / dev-lang/vala) +VALAC=${VALAC#dev-lang/vala-} +VALAC=${VALAC%.*} +echo "export VALAC=/usr/bin/valac-${VALAC}" >> /ci/env_vars.sh + # Cleanup to avoid including large contents in the docker image. # We don't need cache files that are side artifacts of installing packages. # We also don't need the gentoo tree -- the official docker image doesn't