From nobody Tue Jun 20 10:29:20 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QljYF1MjQz4g8Yk; Tue, 20 Jun 2023 10:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QljYF0sNyz3w1D; Tue, 20 Jun 2023 10:29:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687256961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugKRp8sczC9JmOs9BXiHoCvAFeDix4zCnvx7fqKxZMI=; b=t5uc62QCwGw4GDP6f3oA8kr57Rfj101e0xtHncM8OgPEKs6MOOEr+6XafTXleFuM1w5jzi N+jVYjkjlL0MA78BPdj7Y9gib8ApCsBEsGz/fT2P0Xs9bKhC7LFCxjWbC3I2/L1UYw7KQX bUCTGd889DU5sJUWPw+uY+eqiWpYpsouH0bPkrJNu/2/DOA9j4XeICiuoTQ2br3ZcnD3Mc rOHuiVjxiL1tdV3etkw4L/+P3eDOVm47QtVS2N9jhe0/fexZNAS6xha0O10s9MmMKy4EWK MrCqNhF7gDsTLlK07xZPwQ+PJ/4kE9lxssIbdBX/JV5QebYhT+R8oK+0nl/iZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687256961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugKRp8sczC9JmOs9BXiHoCvAFeDix4zCnvx7fqKxZMI=; b=Bkq4hVl6TBhtPqTAY4mVc5T+yPt9MOkaxMMh7agSSIbrmu7NAcpifIiG8tKk9B/1v2uswC 1zv5Tb4KKnGYsQGKJ4QYvifwFGIG/P7fNQqmN1+Q70II6SGi7wWARHKMnj1G41h2jBThVD Hgox07zzSeLv417T9Eir1xotauHpqf6hQf1sceeieRLnxZvRpr8jMIZSXezk5byZ+I8raE wdOksnV7gDH9BjMynbkiA42vQHN67br1ZU6hh+608pAMKmuBwKWTELP6t/ymzkHqiCzW9i 6WuUXP4uPsJbDen29d2QYsM5iOzHNxkDL71AfT2Qn6ulRUtraDzQY5zcAI9Etg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687256961; a=rsa-sha256; cv=none; b=LfTGC7r/slPuC8bMFWs2UGcT7PJFfF37QFPZzRPl23w11Yy0HHV1jz3WDRVmhO4dc0eo1a 7u2ZfxDoJqdXMpgdgvLdWdjiU/ihPdvGmWwMyB3GEfYarh9Npxk6O1kc5SpWW56nF79n8e fHwNloiZkuuEJ1U498SH/3Q2anJRrDZ+DoY9IdUEubewPLw0DhnZcuBF+Gmrg3wmjZIW2N 0Pl0TLKagknKAIOvTQFYd93MojSQ4IryClN0ycWXDcwWlKHZLtSObxeqcPClAOfr59JcRf 7D6vAo1fnT2hLQ/knvHbNrxztNRVzgduBVrvLU0iwfgdtS+iqBd4pUdenWu1tQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QljYD6yXKzvx7; Tue, 20 Jun 2023 10:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KATKIr050413; Tue, 20 Jun 2023 10:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KATKi8050412; Tue, 20 Jun 2023 10:29:20 GMT (envelope-from git) Date: Tue, 20 Jun 2023 10:29:20 GMT Message-Id: <202306201029.35KATKi8050412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 1fbe8feadf59 - main - lang/rust: Documentation installation fix. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1fbe8feadf597e617d28e3d86fd7cf5cb3b0af77 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=1fbe8feadf597e617d28e3d86fd7cf5cb3b0af77 commit 1fbe8feadf597e617d28e3d86fd7cf5cb3b0af77 Author: Mikael Urankar AuthorDate: 2023-06-20 10:26:46 +0000 Commit: Mikael Urankar CommitDate: 2023-06-20 10:29:14 +0000 lang/rust: Documentation installation fix. Add the missing _COMPONENTS for the documentation. Differential Revision: https://reviews.freebsd.org/D40510 --- lang/rust/Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 0db68e50d2c8..0cac87ed77a5 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,6 +1,6 @@ PORTNAME= rust PORTVERSION?= 1.70.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ https://dev-static.rust-lang.org/dist/:src \ @@ -50,15 +50,14 @@ TMPDIR?= ${WRKDIR} OPTIONS_DEFINE= DOCS GDB SOURCES WASM OPTIONS_DEFAULT= SOURCES WASM -.if !defined(NIGHTLY_DATE) -OPTIONS_EXCLUDE= DOCS # https://github.com/rust-lang/rust/issues/76526 -.endif GDB_DESC= Install ports gdb (necessary for debugging rust programs) SOURCES_DESC= Install source files WASM_DESC= Build the WebAssembly target (wasm32-unknown-unknown) -DOCS_VARS= _RUST_BUILD_DOCS=true +DOCS_VARS= _RUST_BUILD_DOCS=true \ + _COMPONENTS+="rust-docs-${_PACKAGE_VERS}-${_RUST_TARGET} rust-docs-json-${_PACKAGE_VERS}-${_RUST_TARGET}" \ + _RUST_TOOLS+=rustdoc DOCS_VARS_OFF= _RUST_BUILD_DOCS=false GDB_RUN_DEPENDS= ${LOCALBASE}/bin/gdb:devel/gdb SOURCES_VARS= _COMPONENTS+=rust-src-${_PACKAGE_VERS} \ @@ -120,6 +119,10 @@ _COMPONENTS+= rls-${_PACKAGE_VERS}-${_RUST_TARGET} _COMPONENTS+= rustc-dev-${_PACKAGE_VERS}-${_RUST_TARGET} .endif +.if ${PORT_OPTIONS:MWASM} && ${PORT_OPTIONS:MDOCS} +_COMPONENTS+= rust-docs-${_PACKAGE_VERS}-wasm32-unknown-unknown rust-docs-json-${_PACKAGE_VERS}-wasm32-unknown-unknown +.endif + # If the kernel does not return sane kern.proc.pathname values # for hardlinks then disable hardlinks in the build to avoid # intermittent "can't find crate for `std`" build failures,