Mon Jul 12 12:56:13 2021 UTC ()
Pullup ticket #6486 - requested by he
lang/rust: build fix
Revisions pulled up:
- lang/rust/Makefile 1.242
- lang/rust/options.mk 1.15
---
Module Name: pkgsrc
Committed By: he
Date: Sun Jul 11 22:13:38 UTC 2021
Modified Files:
pkgsrc/lang/rust: Makefile options.mk
Log Message:
Evidently, cmake is needed in all cases.
Move cmake dependency out of condition on PKG_OPTIONS.rust-llvm.
(bsiegert)
diff -r1.241 -r1.241.2.1 pkgsrc/lang/rust/Makefile
diff -r1.14 -r1.14.2.1 pkgsrc/lang/rust/options.mk
--- pkgsrc/lang/rust/Makefile 2021/06/13 12:19:16 1.241
+++ pkgsrc/lang/rust/Makefile 2021/07/12 12:56:13 1.241.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.241 2021/06/13 12:19:16 he Exp $
+# $NetBSD: Makefile,v 1.241.2.1 2021/07/12 12:56:13 bsiegert Exp $
DISTNAME= rustc-1.52.1-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -594,6 +594,8 @@
DEPENDS+= libatomic-links>=0:../../devel/libatomic-links
.endif
+BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
+.include "../../devel/cmake/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../lang/python/tool.mk"
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/lang/rust/options.mk 2021/04/04 08:51:20 1.14
+++ pkgsrc/lang/rust/options.mk 2021/07/12 12:56:13 1.14.2.1
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2021/04/04 08:51:20 he Exp $
+# $NetBSD: options.mk,v 1.14.2.1 2021/07/12 12:56:13 bsiegert Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS+= rust-cargo-static
@@ -26,10 +26,7 @@
# Use the internal copy of LLVM.
# This contains some extra optimizations.
#
-.if !empty(PKG_OPTIONS:Mrust-llvm)
-BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake
-.include "../../devel/cmake/buildlink3.mk"
-.else
+.if empty(PKG_OPTIONS:Mrust-llvm)
.include "../../lang/llvm/buildlink3.mk"
CONFIGURE_ARGS+= --enable-llvm-link-shared
CONFIGURE_ARGS+= --llvm-root=${BUILDLINK_PREFIX.llvm}