public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Yixun Lan" <dlan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/zerotier/
Date: Mon, 12 Aug 2024 08:56:32 +0000 (UTC)	[thread overview]
Message-ID: <1723452778.5b8f27f19e24d19c418a5be21d77f92b2b549157.dlan@gentoo> (raw)

commit:     5b8f27f19e24d19c418a5be21d77f92b2b549157
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sun Aug 11 20:33:28 2024 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 08:52:58 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8f27f1

net-misc/zerotier: use target specific dir for cargo

Closes: https://bugs.gentoo.org/937782
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-misc/zerotier/zerotier-1.14.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-misc/zerotier/zerotier-1.14.0.ebuild b/net-misc/zerotier/zerotier-1.14.0.ebuild
index 8a00c6b94532..933ff2176ec9 100644
--- a/net-misc/zerotier/zerotier-1.14.0.ebuild
+++ b/net-misc/zerotier/zerotier-1.14.0.ebuild
@@ -413,9 +413,11 @@ src_prepare() {
 
 	#1. Dont call cargo, we'll run it with cargo eclass functions
 	#2. Remove man page compression and install, we'll handle it with ebuild functions
+	#3. Gentoo generates target specific build dirs now bug #937782
 	sed -i \
 		-e '/ifeq ($(ZT_SSO_SUPPORTED)/,/endif/ { /cargo build/d }' \
 		-e '/install:/,/^$/ { /man[0-9]/d }' \
+		-e "s|rustybits/target/$(usex debug debug release)|rustybits/$(cargo_target_dir)|" \
 		make-linux.mk || die
 }
 


             reply	other threads:[~2024-08-12  8:56 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-12  8:56 Yixun Lan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-03-28 13:03 [gentoo-commits] repo/gentoo:master commit in: net-misc/zerotier/ Yixun Lan
2025-03-16 15:05 Sam James
2024-11-09  7:54 Sam James
2024-10-31  9:28 Yixun Lan
2024-10-31  9:28 Yixun Lan
2024-09-13  7:51 Yixun Lan
2024-05-22  3:06 Yixun Lan
2023-11-13 23:34 Yixun Lan
2023-10-28  0:24 Sam James
2023-08-11  9:42 Ulrich Müller
2023-07-27  9:08 Sam James
2022-08-26  6:29 Yixun Lan
2021-04-12 19:27 Lars Wendler
2021-04-12 18:12 Lars Wendler
2021-04-12 16:55 Lars Wendler
2021-04-12 16:41 Lars Wendler
2021-02-06 15:32 Lars Wendler
2021-01-25 20:21 Lars Wendler
2020-02-26 18:25 Andreas Sturmlechner
2020-02-26 16:17 Joonas Niilola
2019-04-21  3:26 Anthony G. Basile
2018-12-09  0:02 Anthony G. Basile
2018-10-15 20:00 Virgil Dupras
2018-10-15 20:00 Virgil Dupras
2018-09-25 12:00 Jeroen Roovers
2018-05-16  7:26 Michał Górny
2018-02-12  8:14 Patrice Clement
2018-02-07  9:29 Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1723452778.5b8f27f19e24d19c418a5be21d77f92b2b549157.dlan@gentoo \
    --to=dlan@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox