CVS commit: pkgsrc/lang/rust

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sat Apr 23 15:54:34 UTC 2022

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

Log Message:
lang/rust: don't depend in libunwind, does not appear to be required.

Also remove the workaround for PR#56791, now that sparc64 can
build rust without the "rust-llvm" option set.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/rust/options.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/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.21 pkgsrc/lang/rust/options.mk:1.22
--- pkgsrc/lang/rust/options.mk:1.21    Mon Apr 18 14:59:59 2022
+++ pkgsrc/lang/rust/options.mk Sat Apr 23 15:54:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2022/04/18 14:59:59 he Exp $
+# $NetBSD: options.mk,v 1.22 2022/04/23 15:54:34 he Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS+=        rust-cargo-static rust-docs
@@ -20,15 +20,6 @@ PKG_SUGGESTED_OPTIONS+=              rust-llvm
 PKG_SUGGESTED_OPTIONS+=        rust-cargo-static
 .endif
 
-# (NetBSD)/sparc64 systems fail to build libunwind 13.0.1,
-# and libunwind is depended on here unless rust-llvm is turned
-# on.  The latter succeeds, though.  So default to using
-# rust-llvm on NetBSD/sparc64.
-# Ref. PR#56791
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-PKG_SUGGESTED_OPTIONS+=                rust-llvm
-.endif
-
 .include "../../mk/bsd.options.mk"
 
 #
@@ -37,7 +28,6 @@ PKG_SUGGESTED_OPTIONS+=               rust-llvm
 #
 .if empty(PKG_OPTIONS:Mrust-llvm)
 BUILDLINK_API_DEPENDS.llvm+=   llvm>=12.0.0
-.include "../../lang/libunwind/buildlink3.mk"
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-llvm-link-shared
 #CONFIGURE_ARGS+=      --llvm-libunwind=system