CVS commit: pkgsrc/lang/rust

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue May 16 06:10:52 UTC 2023

Modified Files:
        pkgsrc/lang/rust: cargo.mk

Log Message:
rust/cargo.mk: do not use cargo-install if GNU_CONFIGURE is set

Fixes installation of librsvg


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/lang/rust/cargo.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/rust/cargo.mk
diff -u pkgsrc/lang/rust/cargo.mk:1.34 pkgsrc/lang/rust/cargo.mk:1.35
--- pkgsrc/lang/rust/cargo.mk:1.34      Mon May 15 20:07:36 2023
+++ pkgsrc/lang/rust/cargo.mk   Tue May 16 06:10:52 2023
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.34 2023/05/15 20:07:36 wiz Exp $
+# $NetBSD: cargo.mk,v 1.35 2023/05/16 06:10:52 wiz Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
@@ -87,7 +87,7 @@ do-build: do-cargo-build
 do-cargo-build:
        ${RUN} cd ${CARGO_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo ${CARGO_ARGS}
 
-.if !target(do-install)
+.if !target(do-install) && ${GNU_CONFIGURE:Uno:tl} == no
 do-install: do-cargo-install
 .endif