On 2025-09-05 at 11:51:03, Patrick Steinhardt wrote:
> diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
> index 4eaf3514d6..4c58c7238e 100755
> --- a/ci/install-dependencies.sh
> +++ b/ci/install-dependencies.sh
> @@ -31,7 +31,7 @@ alpine-*)
> ;;
> fedora-*|almalinux-*)
> dnf -yq update >/dev/null &&
> - dnf -yq install shadow-utils sudo meson ninja pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel >/dev/null
> + dnf -yq install shadow-utils sudo meson ninja pkg-config gcc findutils diffutils perl python3 gawk gettext zlib-devel expat-devel openssl-devel curl-devel pcre2-devel rustc >/dev/null
I know nothing about how Fedora packages Rust. Do we need a cargo
package here as well, is that automatically included, or is it
unnecessary?
> ubuntu-*|i386/ubuntu-*|debian-*)
> # Required so that apt doesn't wait for user input on certain packages.
> @@ -58,7 +58,7 @@ ubuntu-*|i386/ubuntu-*|debian-*)
> make libssl-dev libcurl4-openssl-dev libexpat-dev wget sudo default-jre \
> tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \
> libemail-valid-perl libio-pty-perl libio-socket-ssl-perl libnet-smtp-ssl-perl libdbd-sqlite3-perl libcgi-pm-perl \
> - libsecret-1-dev libpcre2-dev meson ninja-build pkg-config \
> + libsecret-1-dev libpcre2-dev meson ninja-build pkg-config cargo \
> ${CC_PACKAGE:-${CC:-gcc}} $PYTHON_PACKAGE
Seems reasonable. That will definitely pull in rustc as well.
> case "$distro" in
> diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
> index 3680446649..c718bd101a 100755
> --- a/ci/run-build-and-tests.sh
> +++ b/ci/run-build-and-tests.sh
> @@ -9,7 +9,9 @@ case "$jobname" in
> fedora-breaking-changes-musl|linux-breaking-changes)
> export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
> export WITH_BREAKING_CHANGES=YesPlease
> + export WITH_RUST=YesPlease
> MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true"
> + MESONFLAGS="$MESONFLAGS -Drust=enabled"
Looks good.
--
brian m. carlson (they/them)
Toronto, Ontario, CA
Attachment:
signature.asc
Description: PGP signature
