CVS commit: pkgsrc/lang/rust

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Feb 21 16:04:50 UTC 2020

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

Log Message:
Fix building with external LLVM; allow any Python


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.5 -r1.6 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/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.140 pkgsrc/lang/rust/Makefile:1.141
--- pkgsrc/lang/rust/Makefile:1.140     Thu Feb 20 14:00:49 2020
+++ pkgsrc/lang/rust/Makefile   Fri Feb 21 16:04:50 2020
@@ -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 @@ CHECK_PORTABILITY_SKIP+=      vendor/openssl-
 
 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}

Index: pkgsrc/lang/rust/options.mk
diff -u pkgsrc/lang/rust/options.mk:1.5 pkgsrc/lang/rust/options.mk:1.6
--- pkgsrc/lang/rust/options.mk:1.5     Mon Sep  9 16:19:49 2019
+++ pkgsrc/lang/rust/options.mk Fri Feb 21 16:04:50 2020
@@ -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 @@ BUILD_DEPENDS+=       cmake-[0-9]*:../../devel
 .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