blah4

Use the new unstable meson cargo support. This simplifies the
meson.build script and allows to use crates such as clap that require
picking up features from Cargo.toml.

This also allows us to not embed thiserror in subprojects, and instead
use a wrap file with a custom meson.build and some patches to make it
compile without running its build.rs script.

.docker/Dockerfile

@@ -20,7 +20,7 @@ COPY etc/portage/repos.conf /etc/portage/
 
 RUN mkdir -p /var/cache/distfiles/git3-src && chown portage:portage /var/cache/distfiles/git3-src
 
-RUN emerge =dev-build/meson-9999::spawns
+RUN EGIT_COMMIT=049ca1b6d5a5add57b592c60c4ccd33c67ba1941 USE=verify-sig emerge =dev-build/meson-9999::spawns
 
 RUN useradd -m gentooligan
 

.gitea/workflows/gentoo-utils.yml

@@ -89,7 +89,7 @@ jobs:
       image_tag: ${{ steps.image-changes.outputs.image_tag }}
 
   build:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -102,13 +102,15 @@ jobs:
 
       - name: build and check
         run: |
+          cat /usr/lib/python3.13/site-packages/mesonbuild/cargo/interpreter.py
+          sha1sum /usr/lib/python3.13/site-packages/mesonbuild/modules/rust.py
           meson setup -Dfuzz=enabled -Dtests=enabled -Dbuildtype=debugoptimized -Ddocs=enabled build
           meson compile -C build
 
   # FIXME: Currently this rebuilds everything. Instead we should bring over the build dir from the build job. This will come in handy
   # when we have multiple build targets and configs. What we have currently is fine until we get lots of builds going
   test:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -126,7 +128,7 @@ jobs:
           ninja test -C build
 
   fuzz:
-    runs-on: gentoo
+    runs-on: brutalisk
     env:
       CC: 'clang'
       CXX: 'clang++'
@@ -158,7 +160,7 @@ jobs:
         continue-on-error: true
 
   check-format:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -173,7 +175,7 @@ jobs:
           ninja rustfmt -C build
 
   docs:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}
@@ -187,7 +189,7 @@ jobs:
           ninja rustdoc -C docs
 
   grep:
-    runs-on: gentoo
+    runs-on: brutalisk
     needs: [build-oci-image]
     container:
       image: ${{ vars.REGISTRY_URL }}/${{ gitea.repository }}:${{ needs.build-oci-image.outputs.image_tag }}