commit: 4f8098bdc3db1817dcdf3956ec6dba61703f2ed4 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat May 20 12:58:32 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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" )
