From fec6701bed41fe4ba68e3e79780d51b8a3b2e450 Mon Sep 17 00:00:00 2001 From: Lucio Sauer Date: Fri, 9 Aug 2024 16:23:40 +0200 Subject: [PATCH] dev-libs/libsignal-ffi: fix Cargo target directory Following recent cargo eclass changes (27d469a2114b4ad0b3e682854c50c806753eb472) the Cargo target directory unconditionally contains $(rust_abi) in its path. Closes: https://bugs.gentoo.org/937602 Signed-off-by: Lucio Sauer --- dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild | 8 +------- dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild | 8 +------- dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild index 299a617152..924742f74d 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.44.0.ebuild @@ -39,11 +39,5 @@ src_unpack() { } src_install() { - if use debug; then - TARGET=debug - else - TARGET=release - fi - - dolib.a "${WORKDIR}/${P/-ffi/}/target/${TARGET}/${PN/-/_}.a" + dolib.a "${WORKDIR}/${P/-ffi/}/$(cargo_target_dir)/${PN/-/_}.a" } diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild index 299a617152..924742f74d 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.46.0.ebuild @@ -39,11 +39,5 @@ src_unpack() { } src_install() { - if use debug; then - TARGET=debug - else - TARGET=release - fi - - dolib.a "${WORKDIR}/${P/-ffi/}/target/${TARGET}/${PN/-/_}.a" + dolib.a "${WORKDIR}/${P/-ffi/}/$(cargo_target_dir)/${PN/-/_}.a" } diff --git a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild index 577f3cf6ae..0956528621 100644 --- a/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild +++ b/dev-libs/libsignal-ffi/libsignal-ffi-0.51.0.ebuild @@ -39,11 +39,5 @@ src_unpack() { } src_install() { - if use debug; then - TARGET=debug - else - TARGET=release - fi - - dolib.a "${WORKDIR}/${P/-ffi/}/target/${TARGET}/${PN/-/_}.a" + dolib.a "${WORKDIR}/${P/-ffi/}/$(cargo_target_dir)/${PN/-/_}.a" }