From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59203158176 for ; Thu, 09 Oct 2025 07:02:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 452E934109A for ; Thu, 09 Oct 2025 07:02:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9CCA3110575; Thu, 09 Oct 2025 07:02:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 948B2110575 for ; Thu, 09 Oct 2025 07:02:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5081934103F for ; Thu, 09 Oct 2025 07:02:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9B8993AE6 for ; Thu, 09 Oct 2025 07:02:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1759993248.db9c0e8b3b0977da11be5b8d79bf13c5d3f8a120.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rapidjson/, dev-libs/rapidjson/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild X-VCS-Directories: dev-libs/rapidjson/ dev-libs/rapidjson/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: db9c0e8b3b0977da11be5b8d79bf13c5d3f8a120 X-VCS-Branch: master Date: Thu, 09 Oct 2025 07:02:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07e6acdb-448b-4b67-8a06-331aa07616e4 X-Archives-Hash: 42ae4e50fdf2f4e9dfa02ffe0e22f48b commit: db9c0e8b3b0977da11be5b8d79bf13c5d3f8a120 Author: Z. Liu gmail com> AuthorDate: Tue Jun 24 15:20:13 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 9 07:00:48 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9c0e8b dev-libs/rapidjson: fix build if USE="doc" by applying the upstream patch to expand the glob. Affter the minimum required CMake version was raised from 2.8 to 3.5 in the last commit, Ninja reports: > ninja: error: 'doc/Doxyfile*', needed by 'doc/html', missing and no known rule to make it Closes: https://bugs.gentoo.org/956433 Signed-off-by: Z. Liu gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42735 Closes: https://github.com/gentoo/gentoo/pull/42735 Signed-off-by: Sam James gentoo.org> .../files/rapidjson-1.1.0-doc-build.patch | 41 ++++++++++++++++++++++ dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch b/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch new file mode 100644 index 000000000000..6e5f70c72c5e --- /dev/null +++ b/dev-libs/rapidjson/files/rapidjson-1.1.0-doc-build.patch @@ -0,0 +1,41 @@ +https://github.com/Tencent/rapidjson/commit/bbdf5d1d4b40891c82e5c1946d32dfc841926066 + +From bbdf5d1d4b40891c82e5c1946d32dfc841926066 Mon Sep 17 00:00:00 2001 +From: Christopher Warrington +Date: Tue, 5 Sep 2017 16:58:09 -0700 +Subject: [PATCH] Fix Windows doc build MSBuild error MSB6001 + +When using a MSBuild-based CMake generator like 'Visual Studio 15 2017 +Win64', the doc build was failing with the error 'MSB6001: Invalid +command line switch for "cmd.exe". Illegal characters in path.' + +This was due to the dependency on Doxyfile*, which wasn't expanded by +CMake. + +The fix is to expand this glob in CMake before specifying the custom +command's dependencies. + +Partial fix for https://github.com/miloyip/rapidjson/issues/622 + +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index c1f165a3..c5345ba6 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -10,11 +10,13 @@ ELSE() + CONFIGURE_FILE(Doxyfile.in Doxyfile @ONLY) + CONFIGURE_FILE(Doxyfile.zh-cn.in Doxyfile.zh-cn @ONLY) + ++ file(GLOB DOXYFILES ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile*) ++ + add_custom_command(OUTPUT html + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile.zh-cn + COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/html +- DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile* ++ DEPENDS ${MARKDOWN_DOC} ${SOURCES} ${DOXYFILES} + WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../ + ) + +-- +2.45.2 + diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild index d127af34fca5..75d7d6cc093e 100644 --- a/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild +++ b/dev-libs/rapidjson/rapidjson-1.1.0-r5.ebuild @@ -34,6 +34,7 @@ PATCHES=( "${FILESDIR}/${P}-valgrind_optional.patch" "${FILESDIR}/${P}-gcc14-const.patch" "${FILESDIR}/${P}-cmake4.patch" + "${FILESDIR}/${P}-doc-build.patch" ) src_prepare() {