From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 067A2158089 for ; Wed, 18 Oct 2023 17:01:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F41D2BC0E3; Wed, 18 Oct 2023 17:01:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35A372BC0E3 for ; Wed, 18 Oct 2023 17:01:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19B8F335CB7 for ; Wed, 18 Oct 2023 17:01:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCD9A1149 for ; Wed, 18 Oct 2023 17:01:08 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1697648400.c881d9de00195dce9125d3a408d17cfc5a5d10ed.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-lang/rust/rust-1.73.0.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: c881d9de00195dce9125d3a408d17cfc5a5d10ed X-VCS-Branch: master Date: Wed, 18 Oct 2023 17:01:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0298322c-fcbd-4e33-824a-9ee37a9c6249 X-Archives-Hash: 2be94f3de273eeb9cbce0a924adc5d96 commit: c881d9de00195dce9125d3a408d17cfc5a5d10ed Author: Caleb Stein calebstein net> AuthorDate: Wed Oct 18 16:22:33 2023 +0000 Commit: orbea riseup net> CommitDate: Wed Oct 18 17:00:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=c881d9de dev-lang/rust: fixed rust-1.73.0 failing to build Signed-off-by: Caleb Stein calebstein.net> Signed-off-by: orbea riseup.net> dev-lang/rust/rust-1.73.0.ebuild | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dev-lang/rust/rust-1.73.0.ebuild b/dev-lang/rust/rust-1.73.0.ebuild index abb848a..44df771 100644 --- a/dev-lang/rust/rust-1.73.0.ebuild +++ b/dev-lang/rust/rust-1.73.0.ebuild @@ -175,6 +175,14 @@ clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die } +eapply_crate() { + pushd "${1:?}" > /dev/null || die + local patch="${2:?}" + eapply "${patch}" + "${EPREFIX}"/bin/sh "${FILESDIR}"/rehash-crate.sh "${patch}" || die + popd > /dev/null || die +} + toml_usex() { usex "${1}" true false } @@ -288,6 +296,8 @@ esetup_unwind_hack() { } src_prepare() { + eapply_crate vendor/openssl-sys "${FILESDIR}"/1.72.0-libressl-openssl-sys.patch + # Clear vendor checksums for crates that we patched to bump libc. for i in addr2line-0.20.0 bstr cranelift-jit crossbeam-channel elasticlunr-rs handlebars icu_locid libffi \ terminal_size tracing-tree; do