pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc rust: For clarity, rename rust-llvm to rust-internal-llvm



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bab9729df609
branches:  trunk
changeset: 380727:bab9729df609
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon Jun 13 13:38:19 2022 +0000

description:
rust: For clarity, rename rust-llvm to rust-internal-llvm

diffstat:

 lang/rust/options.mk            |  13 +++++++------
 mk/defaults/options.description |   2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 5d1bc033daa3 -r bab9729df609 lang/rust/options.mk
--- a/lang/rust/options.mk      Mon Jun 13 11:50:48 2022 +0000
+++ b/lang/rust/options.mk      Mon Jun 13 13:38:19 2022 +0000
@@ -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 @@
 
 # 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-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
diff -r 5d1bc033daa3 -r bab9729df609 mk/defaults/options.description
--- a/mk/defaults/options.description   Mon Jun 13 11:50:48 2022 +0000
+++ b/mk/defaults/options.description   Mon Jun 13 13:38:19 2022 +0000
@@ -745,7 +745,7 @@
 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.



Home | Main Index | Thread Index | Old Index