From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B102E15806E for ; Sat, 20 May 2023 13:00:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E53CCE0891; Sat, 20 May 2023 13:00:29 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C536FE0891 for ; Sat, 20 May 2023 13:00:29 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D04A340BEA for ; Sat, 20 May 2023 13:00:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8398A65 for ; Sat, 20 May 2023 13:00:26 +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: <1684587597.4f8098bdc3db1817dcdf3956ec6dba61703f2ed4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.9.7-r1.ebuild app-doc/doxygen/doxygen-1.9.7.ebuild app-doc/doxygen/doxygen-9999.ebuild X-VCS-Directories: app-doc/doxygen/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4f8098bdc3db1817dcdf3956ec6dba61703f2ed4 X-VCS-Branch: master Date: Sat, 20 May 2023 13:00:26 +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: 0e7bda0f-8726-4a8d-9006-aafc1ee64516 X-Archives-Hash: 7cef12a615c5bfd12c2d5be257492ecb commit: 4f8098bdc3db1817dcdf3956ec6dba61703f2ed4 Author: Sam James gentoo org> AuthorDate: Sat May 20 12:58:32 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat May 20 12:59:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8098bd app-doc/doxygen: fix spdlog usage It's linked statically normally but if we force dynamic linking, it ends up using but then not installing (bundled, just-built) libspdlog. Bug: https://bugs.gentoo.org/906848 Signed-off-by: Sam James gentoo.org> app-doc/doxygen/{doxygen-1.9.7.ebuild => doxygen-1.9.7-r1.ebuild} | 4 +++- app-doc/doxygen/doxygen-9999.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app-doc/doxygen/doxygen-1.9.7.ebuild b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild similarity index 96% rename from app-doc/doxygen/doxygen-1.9.7.ebuild rename to app-doc/doxygen/doxygen-1.9.7-r1.ebuild index b59798ef9a23..74b00ea0082d 100644 --- a/app-doc/doxygen/doxygen-1.9.7.ebuild +++ b/app-doc/doxygen/doxygen-1.9.7-r1.ebuild @@ -19,7 +19,8 @@ fi DESCRIPTION="Documentation system for most programming languages" HOMEPAGE="https://www.doxygen.nl/" -LICENSE="GPL-2" +# GPL-2 also for bundled libmscgen, MIT for bundled spdlog +LICENSE="GPL-2 MIT" SLOT="0" IUSE="clang debug doc dot doxysearch qt5 sqlite test" # We need TeX for tests, bug #765472 @@ -105,6 +106,7 @@ src_configure() { -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex qt5) -Duse_sqlite3=$(usex sqlite) + -DBUILD_SHARED_LIBS=OFF -DGIT_EXECUTABLE="false" ) diff --git a/app-doc/doxygen/doxygen-9999.ebuild b/app-doc/doxygen/doxygen-9999.ebuild index b59798ef9a23..74b00ea0082d 100644 --- a/app-doc/doxygen/doxygen-9999.ebuild +++ b/app-doc/doxygen/doxygen-9999.ebuild @@ -19,7 +19,8 @@ fi DESCRIPTION="Documentation system for most programming languages" HOMEPAGE="https://www.doxygen.nl/" -LICENSE="GPL-2" +# GPL-2 also for bundled libmscgen, MIT for bundled spdlog +LICENSE="GPL-2 MIT" SLOT="0" IUSE="clang debug doc dot doxysearch qt5 sqlite test" # We need TeX for tests, bug #765472 @@ -105,6 +106,7 @@ src_configure() { -Dbuild_search=$(usex doxysearch) -Dbuild_wizard=$(usex qt5) -Duse_sqlite3=$(usex sqlite) + -DBUILD_SHARED_LIBS=OFF -DGIT_EXECUTABLE="false" )