commit: 03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115 Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> AuthorDate: Sat May 14 20:37:58 2022 +0000 Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> CommitDate: Sat May 14 20:40:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f0bf4c
app-doc/doxygen: do not force -std=libc++ when compiling with clang Closes: https://bugs.gentoo.org/822615 Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> app-doc/doxygen/doxygen-1.9.1.ebuild | 1 + app-doc/doxygen/doxygen-1.9.2.ebuild | 1 + app-doc/doxygen/doxygen-1.9.3.ebuild | 1 + app-doc/doxygen/doxygen-1.9.4.ebuild | 1 + .../doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch | 13 +++++++++++++ 5 files changed, 17 insertions(+) diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild index ae3d7c399068..ba0582b0ce36 100644 --- a/app-doc/doxygen/doxygen-1.9.1.ebuild +++ b/app-doc/doxygen/doxygen-1.9.1.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" "${FILESDIR}/${PN}-1.9.1-header-dep.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild index 11119d56adfb..4549a203399b 100644 --- a/app-doc/doxygen/doxygen-1.9.2.ebuild +++ b/app-doc/doxygen/doxygen-1.9.2.ebuild @@ -61,6 +61,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" "${FILESDIR}/${PN}-1.9.1-header-dep.patch" "${FILESDIR}/${P}-xml-static.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild index 079039828291..b4cc327223aa 100644 --- a/app-doc/doxygen/doxygen-1.9.3.ebuild +++ b/app-doc/doxygen/doxygen-1.9.3.ebuild @@ -58,6 +58,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild index dde798573c04..925f54421fa8 100644 --- a/app-doc/doxygen/doxygen-1.9.4.ebuild +++ b/app-doc/doxygen/doxygen-1.9.4.ebuild @@ -58,6 +58,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" "${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" + "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" ) DOCS=( LANGUAGE.HOWTO README.md ) diff --git a/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch b/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch new file mode 100644 index 000000000000..f33f619e62ed --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3775ed1..b3a1af6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,7 @@ option(build_doc "Build user manual (HTML and PDF)" OFF) + option(build_doc_chm "Build user manual (CHM)" OFF) + option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +- option(use_libc++ "Use libc++ as C++ standard library." ON) ++ option(use_libc++ "Use libc++ as C++ standard library." OFF) + endif() + option(use_libclang "Add support for libclang parsing." OFF) + option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF)
