From nobody Mon Jan 6 00:44:05 2025 X-Original-To: dev-commits-ports-main@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 4YRFmj2svTz5j49F; Mon, 06 Jan 2025 00:44:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YRFmj1pvGz4lLY; Mon, 6 Jan 2025 00:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736124245; 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=11aa8WRGAmQ2SDgGbXFwUBPVuaHGVc8VPbTrbCaovRE=; b=hD474Tst79wTMNkmXsJd/w3CgxEMjpuLQH/uLvSwrdJVPMl16OoSrrxvoetkOVrE6j2i/g jGQP9PHr1FsXWv6ybo0BJla56iQCCG9xELn4A6LWruedDQWmXTaKJuibLmqMlQCEKNfShz GlW4q80NJgl4dJCUwvD+p5hy2DmK9cK0YZE3N5Hya/mIuWeir9C+AulTOmPyHrtQOySW9+ RQJ4nCLCm+NRX+jJ++mwIfwtKeNzBDgG1uDCWIuYcveTVZo/CDZP/SIZ7SvVuDhAKrAVlw Vuck5+8K4yn/MXGoXjZV83EEi94+UllMSvrNoy6C77iT53kPWhpB2wgVroyzVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736124245; 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=11aa8WRGAmQ2SDgGbXFwUBPVuaHGVc8VPbTrbCaovRE=; b=MT4a7IYzDbQP3Y2r6Y0dr6vcRLg6H1++gwxFG+X8sgRbh68/BTYM9f3/UzZAkOrdwKRh7J 9ZR1JDa5MXzoTuhbjxlzfE6YIKdELHR9xMwJzIGIrZNtBM4M2gPnQFgELXWcaKueWLe+6d nYV2qnvsZg0npGYpMOEcwlejz8F0l4lqXlf6p9/kHoPgq58+VizTfea0SCTenvo5SWqDam rC2vpL8FfkjpuodB0JI3+YMGLjw8RmPn2L7ETnqQDs42SQNg35wwsdp1Jj22aVoTXUqAhc teFxr/nOOT0Q4Nbt86RA1ujJX5LzUTmjrrZCrFya0FLBYaKTvDCfT3uIzsFaQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736124245; a=rsa-sha256; cv=none; b=KLbHfN3flnyJpJ1WP3tVTh8M9eL1HYQ1t9hYuowSz+c5gzzCNDSn0lPDcsJgWEg/lDJvkr yll5DTHyYVWrRJTHqvxjS4MF5UGmrnuV1SDTIKkJdgqf4bGwkduEatGPWaMdbbv2iTuLbX V9zmh79Uz//6g3dba8eRIKjLTsMsEM8edLp2vp+PHcGUyYzTKsgMnz98wQG/XXBIv+F1Ck kXGQyg1nJjQIeTbpvYFWcMs2vqBSdSr4CFQuGO4+pyUfrGGBBMbI/uqiqgPUCE+xc5LSxG xEPeyHLjUGwowRlCMs0Rq7wTLURGvPt7g2sNqJCZQZUqrFyN2sXGdqowDLfwKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YRFmj0hvwz11Sy; Mon, 06 Jan 2025 00:44:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5060i51M059797; Mon, 6 Jan 2025 00:44:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5060i505059794; Mon, 6 Jan 2025 00:44:05 GMT (envelope-from git) Date: Mon, 6 Jan 2025 00:44:05 GMT Message-Id: <202501060044.5060i505059794@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 8492d9bdf19a - main - devel/doxygen: Fix parallel examples build (under DOCS) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8492d9bdf19a0c516f98c71e15d22e72bf27f498 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=8492d9bdf19a0c516f98c71e15d22e72bf27f498 commit 8492d9bdf19a0c516f98c71e15d22e72bf27f498 Author: Matthias Andree AuthorDate: 2025-01-05 23:14:27 +0000 Commit: Matthias Andree CommitDate: 2025-01-06 00:43:34 +0000 devel/doxygen: Fix parallel examples build (under DOCS) Tatsuki Makino wrote the original patch vs. Doxygen 1.9.1, but it no longer applied, so I manually re-did following his example. While here, ditch the :noninja, 1.9.6 builds fine with Ninja, too. Obtained from: tatsuki_makino@hotmail.com PR: 259331 Approved by: maintainer timeout (fluffy@, 39 months) --- devel/doxygen/Makefile | 4 +--- devel/doxygen/files/patch-examples_CMakeLists.txt | 26 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 7b97801361cd..e9a391c24291 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -14,7 +14,7 @@ WWW= https://www.doxygen.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= bison cmake:noninja compiler:c++17-lang cpe dos2unix \ +USES= bison cmake compiler:c++17-lang cpe dos2unix \ iconv python shebangfix ALL_TARGET= all @@ -39,8 +39,6 @@ DOCS_PLIST_FILES= share/man/man1/doxygen.1.gz \ share/man/man1/doxyindexer.1.gz \ share/man/man1/doxysearch.1.gz \ share/man/man1/doxywizard.1.gz -# Parallel jobs break when the DOCS option is on -DOCS_VARS= MAKE_JOBS_UNSAFE=yes PORTDOCS= * diff --git a/devel/doxygen/files/patch-examples_CMakeLists.txt b/devel/doxygen/files/patch-examples_CMakeLists.txt new file mode 100644 index 000000000000..c4f60834d17d --- /dev/null +++ b/devel/doxygen/files/patch-examples_CMakeLists.txt @@ -0,0 +1,26 @@ +--- examples/CMakeLists.txt.orig 2022-11-18 19:47:51 UTC ++++ examples/CMakeLists.txt +@@ -74,9 +74,9 @@ foreach (f_inp ${BASIC_EXAMPLES}) + add_custom_command( + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/${f} + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/${f} +- COMMAND ${CMAKE_COMMAND} -E env PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}/doxygen ${f}.cfg ++ COMMAND ${CMAKE_COMMAND} -E env PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}/doxygen ${CMAKE_CURRENT_BINARY_DIR}/${f}.cfg + COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex +- DEPENDS doxygen ${f}.${f_ext} ${f}.cfg ${TOP}/examples/strip_example.py ${f_dep} ++ DEPENDS doxygen ${CMAKE_CURRENT_BINARY_DIR}/${f}.${f_ext} ${CMAKE_CURRENT_BINARY_DIR}/${f}.cfg ${TOP}/examples/strip_example.py ${f_dep} + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/${f}/latex/refman_doc.tex + ) + set(EXAMPLES_RES ${EXAMPLES_RES} "" ${PROJECT_BINARY_DIR}/html/examples/${f}/html/index.html) +@@ -93,9 +93,9 @@ if (DOT) + add_custom_command( + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/html/examples/diagrams + COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/latex/examples/diagrams +- COMMAND ${CMAKE_COMMAND} -E env PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}/doxygen diagrams.cfg ++ COMMAND ${CMAKE_COMMAND} -E env PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH}/doxygen ${CMAKE_CURRENT_BINARY_DIR}/diagrams.cfg + COMMAND ${PYTHON_EXECUTABLE} ${TOP}/examples/strip_example.py < ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman.tex > ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex +- DEPENDS doxygen diagrams_a.h diagrams_b.h diagrams_c.h diagrams_d.h diagrams_e.h diagrams.cfg ${TOP}/examples/strip_example.py ++ DEPENDS doxygen ${CMAKE_CURRENT_BINARY_DIR}/diagrams_a.h ${CMAKE_CURRENT_BINARY_DIR}/diagrams_b.h ${CMAKE_CURRENT_BINARY_DIR}/diagrams_c.h ${CMAKE_CURRENT_BINARY_DIR}/diagrams_d.h ${CMAKE_CURRENT_BINARY_DIR}/diagrams_e.h ${CMAKE_CURRENT_BINARY_DIR}/diagrams.cfg ${TOP}/examples/strip_example.py + OUTPUT ${PROJECT_BINARY_DIR}/html/examples/diagrams/html/index.html ${PROJECT_BINARY_DIR}/latex/examples/diagrams/latex/refman_doc.tex + ) + endif(DOT)