commit: 37f3e05310f4c0cb460f7b691c19c59939aecab5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 29 04:05:39 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 29 04:05:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f3e053
net-libs/rustls-ffi: drop nightly use (again) Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/rustls-ffi-0.12.1-no-rust-nightly.patch | 48 ++++++++++++++++++++++ ....12.1-r1.ebuild => rustls-ffi-0.12.1-r2.ebuild} | 7 ++-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch new file mode 100644 index 000000000000..c6349e37ddba --- /dev/null +++ b/net-libs/rustls-ffi/files/rustls-ffi-0.12.1-no-rust-nightly.patch @@ -0,0 +1,48 @@ +https://github.com/rustls/rustls-ffi/issues/397 +https://github.com/rustls/rustls-ffi/pull/398 + +From 9890aff0f0b1cc69f86c24b217a2515525e57056 Mon Sep 17 00:00:00 2001 +From: Daniel McCarney <dan...@binaryparadox.net> +Date: Wed, 27 Mar 2024 21:08:16 -0400 +Subject: [PATCH] Cargo: configure cargo-c to use vendored .h + +Presently we pre-generate the rustls.h header file using `cbindgen`, +commit the result to `src/rustls.h`, and check that the generated result +matches the checked-in result in CI. + +The new experimental cargo-c build regenerates its own header file using +`cbindgen` by default unless told to do otherwise. We'd prefer it didn't +do this because we're using a `cbindgen` feature that requires nightly +rust. + +This commit updates the `Cargo.toml` capi metadata to tell cargo-c to +skip generation of its own header file. We then configure the +pre-generated checked-in header file as an asset to be copied into the +install include directory. + +This better matches how the `Makefile` build allowed building the static +lib without needing nightly rust or `cbindgen`. +--- + Cargo.toml | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/Cargo.toml b/Cargo.toml +index 7a910a9d..d601c7f8 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -41,6 +41,7 @@ regex = "1.9.6" + [package.metadata.capi.header] + name = "rustls" + subdirectory = false ++generation = false # Prefer a vendored .h + + [package.metadata.capi.library] + name = "rustls" +@@ -50,3 +51,6 @@ rustflags = "-Cmetadata=rustls-ffi" + [package.metadata.capi.pkg_config] + name = "rustls" + filename = "rustls" ++ ++[package.metadata.capi.install.include] ++asset = [{from = "src/rustls.h", to = "" }] + diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild similarity index 96% rename from net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild rename to net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild index 999355fd18f4..962808494628 100644 --- a/net-libs/rustls-ffi/rustls-ffi-0.12.1-r1.ebuild +++ b/net-libs/rustls-ffi/rustls-ffi-0.12.1-r2.ebuild @@ -56,6 +56,10 @@ BDEPEND="dev-util/cargo-c" QA_FLAGS_IGNORED="usr/lib.*/librustls.*" +PATCHES=( + "${FILESDIR}"/${PN}-0.12.1-no-rust-nightly.patch +) + src_prepare() { default @@ -70,9 +74,6 @@ src_configure() { # Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389 export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext" - # https://github.com/rustls/rustls-ffi/issues/397 - export RUSTC_BOOTSTRAP=1 - multilib-minimal_src_configure }
