pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: allow rust-llvm option on Darwin; add rust-docs option
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Thu Oct 28 20:49:33 2021 +0200
Changeset: 736b2a27732cf2f59cf08118edaeb2766698b1dd
Modified Files:
rust/Makefile
rust/options.mk
Log Message:
rust: allow rust-llvm option on Darwin; add rust-docs option
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=736b2a27732cf2f59cf08118edaeb2766698b1dd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/Makefile | 1 -
rust/options.mk | 13 +++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diffs:
diff --git a/rust/Makefile b/rust/Makefile
index d5af363bdb..0cfc32fed7 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -41,7 +41,6 @@ CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH}
CONFIGURE_ARGS+= --enable-extended # Build and install cargo too.
CONFIGURE_ARGS+= --enable-rpath
CONFIGURE_ARGS+= --disable-codegen-tests
-CONFIGURE_ARGS+= --disable-docs
CONFIGURE_ARGS+= --disable-compiler-docs
CONFIGURE_ARGS+= --disable-dist-src
CONFIGURE_ARGS+= --disable-llvm-static-stdcpp
diff --git a/rust/options.mk b/rust/options.mk
index 7dc7cb994e..31cce543b9 100644
--- a/rust/options.mk
+++ b/rust/options.mk
@@ -1,12 +1,12 @@
# $NetBSD: options.mk,v 1.8 2021/01/01 20:44:48 he Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
-PKG_SUPPORTED_OPTIONS+= rust-cargo-static
+PKG_SUPPORTED_OPTIONS+= rust-cargo-static rust-docs
.include "../../mk/bsd.fast.prefs.mk"
# The bundled LLVM current has issues building on SunOS.
-.if ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
+.if ${OPSYS} != "SunOS"
PKG_SUPPORTED_OPTIONS+= rust-llvm
# There may be compatibility issues with base LLVM.
. if !empty(HAVE_LLVM)
@@ -46,3 +46,12 @@ BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
.include "../../www/curl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.endif
+
+#
+# Install documentation.
+#
+.if !empty(PKG_OPTIONS:Mrust-docs)
+CONFIGURE_ARGS+= --enable-docs
+.else
+CONFIGURE_ARGS+= --disable-docs
+.endif
Home |
Main Index |
Thread Index |
Old Index