Date: Tue, 26 Sep 2023 13:29:40 +0000
From: bugzilla-noreply@freebsd.org
To: ports-bugs@FreeBSD.org
Subject: [Bug 273280] Mk/Uses/cargo.mk: Invalid ${WRKDIR}/.cargo/config.toml is generated
Message-ID: <bug-273280-7788-coWoWWEn9y@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-273280-7788@https.bugs.freebsd.org/bugzilla/>
References: <bug-273280-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D273280 Mikael Urankar <mikael@FreeBSD.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |mikael@FreeBSD.org --- Comment #1 from Mikael Urankar <mikael@FreeBSD.org> --- (In reply to Yuri Victorovich from comment #0) This problem arise if there are multiple Cargo.toml containing the same cra= tes in the [patch.crates-io] section, example with libsignal 0.31.0: cat work/libsignal-0.31.0/rust/protocol/fuzz/Cargo.toml [patch.crates-io] # Use our fork of curve25519-dalek for zkgroup support. curve25519-dalek =3D { git =3D 'https://github.com/signalapp/curve25519-dal= ek', tag =3D 'signal-curve25519-4.0.0' } x25519-dalek =3D { git =3D 'https://github.com/signalapp/curve25519-dalek',= tag =3D 'signal-curve25519-4.0.0' } cat work/libsignal-0.31.0/Cargo.toml [patch.crates-io] # Use our fork of curve25519-dalek for zkgroup support. curve25519-dalek =3D { git =3D 'https://github.com/signalapp/curve25519-dal= ek', tag =3D 'signal-curve25519-4.0.0' } x25519-dalek =3D { git =3D 'https://github.com/signalapp/curve25519-dalek',= tag =3D 'signal-curve25519-4.0.0' } boring =3D { git =3D 'https://github.com/signalapp/boring', branch =3D 'lib= signal' } # This revision of snow is where curve25519-dalek v4.0.0 changes were merge= d in snow =3D { git =3D 'https://github.com/mcginty/snow.git', rev =3D '586292364a30ecc74c785228b41e60b3ef03e773' } So x25519-dalek and curve25519-dalek appears twice in work/.cargo/config.to= ml Removing the duplicate in work/.cargo/config.toml won't work as the various= awk scripts remove the [patch.crates-io] section in cargo.toml, cf https://cgit.freebsd.org/ports/tree/Mk/Scripts/cargo-crates-git-configure.a= wk?h=3D2023Q3#n65 So the second run won't put the needed dependency in work/.cargo/config.toml --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-273280-7788-coWoWWEn9y>