[pkgsrc/trunk]: pkgsrc/lang/rust Fix building with external LLVM; allow any P...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4699d3c415ac
branches:  trunk
changeset: 423605:4699d3c415ac
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Feb 21 16:04:50 2020 +0000

description:
Fix building with external LLVM; allow any Python

diffstat:

 lang/rust/Makefile   |  4 +---
 lang/rust/options.mk |  4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r e29a5c1abfab -r 4699d3c415ac lang/rust/Makefile
--- a/lang/rust/Makefile        Fri Feb 21 15:14:52 2020 +0000
+++ b/lang/rust/Makefile        Fri Feb 21 16:04:50 2020 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.140 2020/02/20 14:00:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.141 2020/02/21 16:04:50 adam Exp $
 
 DISTNAME=      rustc-1.41.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
-#PKGREVISION=  2
 CATEGORIES=    lang
 MASTER_SITES=  http://static.rust-lang.org/dist/
 
@@ -24,7 +23,6 @@
 
 HAS_CONFIGURE=                 yes
 PYTHON_FOR_BUILD_ONLY=         yes
-PYTHON_VERSIONS_ACCEPTED=      27
 CONFIG_SHELL=                  ${PYTHONBIN}
 CONFIGURE_SCRIPT=              src/bootstrap/configure.py
 CONFIGURE_ARGS+=               --prefix=${PREFIX}
diff -r e29a5c1abfab -r 4699d3c415ac lang/rust/options.mk
--- a/lang/rust/options.mk      Fri Feb 21 15:14:52 2020 +0000
+++ b/lang/rust/options.mk      Fri Feb 21 16:04:50 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2019/09/09 16:19:49 adam Exp $
+# $NetBSD: options.mk,v 1.6 2020/02/21 16:04:50 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.rust
 PKG_SUPPORTED_OPTIONS= # empty
@@ -29,4 +29,6 @@
 .include "../../lang/llvm/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-llvm-link-shared
 CONFIGURE_ARGS+=       --llvm-root=${BUILDLINK_PREFIX.llvm}
+# XXX: fix for Rust 1.41.0 https://github.com/rust-lang/rust/issues/68714
+MAKE_ENV+=     LIBRARY_PATH=${BUILDLINK_PREFIX.llvm}/lib
 .endif