CVS commit: pkgsrc/lang/rust

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Mon Mar 31 16:38:43 UTC 2025

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

Log Message:
included from wrong file name police


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/rust/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/rust/rust.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/buildlink3.mk
diff -u pkgsrc/lang/rust/buildlink3.mk:1.16 pkgsrc/lang/rust/buildlink3.mk:1.17
--- pkgsrc/lang/rust/buildlink3.mk:1.16 Sun Feb 23 09:11:30 2025
+++ pkgsrc/lang/rust/buildlink3.mk      Mon Mar 31 16:38:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.16 2025/02/23 09:11:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.17 2025/03/31 16:38:43 jakllsch Exp $
 
 BUILDLINK_TREE+=       rust
 
@@ -12,6 +12,13 @@ RUST_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.rust+=   rust>=1.56.1
 BUILDLINK_PKGSRCDIR.rust?=     ../../lang/rust
 BUILDLINK_PASSTHRU_DIRS+=      ${PREFIX}/lib/rustlib
+
+pkgbase:= rust
+.include "../../mk/pkg-build-options.mk"
+.if empty(PKG_BUILD_OPTIONS.rust:Mrust-internal-llvm)
+.  include "../../lang/libunwind/buildlink3.mk"
+.endif
+
 .endif
 
 BUILDLINK_TREE+=       -rust

Index: pkgsrc/lang/rust/rust.mk
diff -u pkgsrc/lang/rust/rust.mk:1.13 pkgsrc/lang/rust/rust.mk:1.14
--- pkgsrc/lang/rust/rust.mk:1.13       Mon Mar 31 16:10:19 2025
+++ pkgsrc/lang/rust/rust.mk    Mon Mar 31 16:38:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: rust.mk,v 1.13 2025/03/31 16:10:19 ryoon Exp $
+# $NetBSD: rust.mk,v 1.14 2025/03/31 16:38:43 jakllsch Exp $
 #
 # This file determines the type of rust package to use.
 #
@@ -53,8 +53,4 @@ BUILDLINK_DEPMETHOD.rust?=            build
 .  endif
 BUILDLINK_API_DEPENDS.rust+=           rust>=${RUST_REQ}
 .  include "${RUST_DIR}/buildlink3.mk"
-   pkgbase:= rust
-.  if empty(PKG_BUILD_OPTIONS.rust:Mrust-internal-llvm)
-.    include "../../lang/libunwind/buildlink3.mk"
-.  endif
 .endif