CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 13 13:38:19 UTC 2022

Modified Files:
        pkgsrc/lang/rust: options.mk
        pkgsrc/mk/defaults: options.description

Log Message:
rust: For clarity, rename rust-llvm to rust-internal-llvm


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/rust/options.mk
cvs rdiff -u -r1.675 -r1.676 pkgsrc/mk/defaults/options.description

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/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.24 pkgsrc/lang/rust/options.mk:1.25
--- pkgsrc/lang/rust/options.mk:1.24    Wed May 25 21:31:26 2022
+++ pkgsrc/lang/rust/options.mk Mon Jun 13 13:38:19 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2022/05/25 21:31:26 he Exp $
+# $NetBSD: options.mk,v 1.25 2022/06/13 13:38:19 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs
@@ -7,10 +7,10 @@ PKG_SUPPORTED_OPTIONS+=       rust-cargo-stati
 
 # The bundled LLVM current has issues building on SunOS.
 .if ${OPSYS} != "SunOS"
-PKG_SUPPORTED_OPTIONS+=                rust-llvm
-# There may be compatibility issues with base LLVM.
+PKG_SUPPORTED_OPTIONS+=                rust-internal-llvm
+# There may be compatibility issues with the base LLVM on e.g. NetBSD.
 .  if !empty(HAVE_LLVM)
-PKG_SUGGESTED_OPTIONS+=                rust-llvm
+PKG_SUGGESTED_OPTIONS+=                rust-internal-llvm
 .  endif
 .endif
 
@@ -20,13 +20,14 @@ PKG_SUGGESTED_OPTIONS+=             rust-llvm
 PKG_SUGGESTED_OPTIONS+=        rust-cargo-static
 .endif
 
+PKG_OPTIONS_LEGACY_OPTS+=      rust-llvm:rust-internal-llvm
+
 .include "../../mk/bsd.options.mk"
 
 #
 # Use the internal copy of LLVM or the external one?
-# The internal one contains some extra optimizations.
 #
-.if empty(PKG_OPTIONS:Mrust-llvm)
+.if empty(PKG_OPTIONS:Mrust-internal-llvm)
 BUILDLINK_API_DEPENDS.llvm+=   llvm>=12.0.0
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-llvm-link-shared

Index: pkgsrc/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.675 pkgsrc/mk/defaults/options.description:1.676
--- pkgsrc/mk/defaults/options.description:1.675        Tue Jun  7 10:28:23 2022
+++ pkgsrc/mk/defaults/options.description      Mon Jun 13 13:38:19 2022
@@ -745,7 +745,7 @@ ruby                        Enable Ruby support.
 ruby-build-ri-db       Build and install database for Ruby's ri utility.
 rust                   Enable Rust support.
 rust-cargo-static      Build cargo semi-statically with built-in curl+openssl
-rust-llvm              Use Rust internal LLVM in builds.
+rust-internal-llvm     Use Rust internal LLVM in builds.
 samba                  Enable Samba file and print services support.
 samplerate             Enable libsamplerate support.
 sane                   Enable support for SANE scanners.