summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2022-05-14 15:37:58 -0500
committerMatthias Maier <tamiko@gentoo.org>2022-05-14 15:40:20 -0500
commit03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115 (patch)
tree68db82c26f4784692c8c86b0211041c924adb73e /app-doc/doxygen
parentdev-util/pkgcheck: add 0.10.10 (diff)
downloadgentoo-03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115.tar.gz
gentoo-03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115.tar.bz2
gentoo-03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115.zip
app-doc/doxygen: do not force -std=libc++ when compiling with clang
Closes: https://bugs.gentoo.org/822615 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-doc/doxygen')
-rw-r--r--app-doc/doxygen/doxygen-1.9.1.ebuild1
-rw-r--r--app-doc/doxygen/doxygen-1.9.2.ebuild1
-rw-r--r--app-doc/doxygen/doxygen-1.9.3.ebuild1
-rw-r--r--app-doc/doxygen/doxygen-1.9.4.ebuild1
-rw-r--r--app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch13
5 files changed, 17 insertions, 0 deletions
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)