Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust rust: More rust.mk explanation.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/de309a9f5bf1
branches:  trunk
changeset: 434336:de309a9f5bf1
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 14 15:38:18 2020 +0000

description:
rust: More rust.mk explanation.

diffstat:

 lang/rust/buildlink3.mk |  13 +++++--------
 lang/rust/rust.mk       |   5 ++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r 1b6b042e40b9 -r de309a9f5bf1 lang/rust/buildlink3.mk
--- a/lang/rust/buildlink3.mk   Sun Jun 14 15:34:45 2020 +0000
+++ b/lang/rust/buildlink3.mk   Sun Jun 14 15:38:18 2020 +0000
@@ -1,4 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.4 2020/05/18 16:17:20 nia Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2020/06/14 15:38:18 nia Exp $
+
+#
+# DO NOT include this directly! Use rust.mk instead.
+#
 
 BUILDLINK_TREE+=       rust
 
@@ -6,14 +10,7 @@
 RUST_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.rust+=   rust>=1.20.0
-
-.include "../../lang/rust/type.mk"
-.if ${RUST_TYPE} != "bin"
 BUILDLINK_PKGSRCDIR.rust?=     ../../lang/rust
-.else
-BUILDLINK_PKGSRCDIR.rust?=     ../../lang/rust-bin
-.endif
-
 BUILDLINK_PASSTHRU_DIRS+=      ${PREFIX}/lib/rustlib
 .endif
 
diff -r 1b6b042e40b9 -r de309a9f5bf1 lang/rust/rust.mk
--- a/lang/rust/rust.mk Sun Jun 14 15:34:45 2020 +0000
+++ b/lang/rust/rust.mk Sun Jun 14 15:38:18 2020 +0000
@@ -1,7 +1,10 @@
-# $NetBSD: rust.mk,v 1.1 2020/06/14 15:33:27 nia Exp $
+# $NetBSD: rust.mk,v 1.2 2020/06/14 15:38:18 nia Exp $
 # 
 # This file determines the type of rust package to use.
 #
+# It should be included by rust-dependent packages that don't use
+# cargo.mk.
+#
 # === User-settable variables ===
 #
 # RUST_TYPE



Home | Main Index | Thread Index | Old Index