| 1 |
commit: 03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 14 20:37:58 2022 +0000 |
| 4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 14 20:40:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f0bf4c |
| 7 |
|
| 8 |
app-doc/doxygen: do not force -std=libc++ when compiling with clang |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/822615 |
| 11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
| 12 |
|
| 13 |
app-doc/doxygen/doxygen-1.9.1.ebuild | 1 + |
| 14 |
app-doc/doxygen/doxygen-1.9.2.ebuild | 1 + |
| 15 |
app-doc/doxygen/doxygen-1.9.3.ebuild | 1 + |
| 16 |
app-doc/doxygen/doxygen-1.9.4.ebuild | 1 + |
| 17 |
.../doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch | 13 +++++++++++++ |
| 18 |
5 files changed, 17 insertions(+) |
| 19 |
|
| 20 |
diff --git a/app-doc/doxygen/doxygen-1.9.1.ebuild b/app-doc/doxygen/doxygen-1.9.1.ebuild |
| 21 |
index ae3d7c399068..ba0582b0ce36 100644 |
| 22 |
--- a/app-doc/doxygen/doxygen-1.9.1.ebuild |
| 23 |
+++ b/app-doc/doxygen/doxygen-1.9.1.ebuild |
| 24 |
@@ -61,6 +61,7 @@ PATCHES=( |
| 25 |
"${FILESDIR}/${PN}-1.8.17-ensure_static_support_libraries.patch" |
| 26 |
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" |
| 27 |
"${FILESDIR}/${PN}-1.9.1-header-dep.patch" |
| 28 |
+ "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" |
| 29 |
) |
| 30 |
|
| 31 |
DOCS=( LANGUAGE.HOWTO README.md ) |
| 32 |
|
| 33 |
diff --git a/app-doc/doxygen/doxygen-1.9.2.ebuild b/app-doc/doxygen/doxygen-1.9.2.ebuild |
| 34 |
index 11119d56adfb..4549a203399b 100644 |
| 35 |
--- a/app-doc/doxygen/doxygen-1.9.2.ebuild |
| 36 |
+++ b/app-doc/doxygen/doxygen-1.9.2.ebuild |
| 37 |
@@ -61,6 +61,7 @@ PATCHES=( |
| 38 |
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" |
| 39 |
"${FILESDIR}/${PN}-1.9.1-header-dep.patch" |
| 40 |
"${FILESDIR}/${P}-xml-static.patch" |
| 41 |
+ "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" |
| 42 |
) |
| 43 |
|
| 44 |
DOCS=( LANGUAGE.HOWTO README.md ) |
| 45 |
|
| 46 |
diff --git a/app-doc/doxygen/doxygen-1.9.3.ebuild b/app-doc/doxygen/doxygen-1.9.3.ebuild |
| 47 |
index 079039828291..b4cc327223aa 100644 |
| 48 |
--- a/app-doc/doxygen/doxygen-1.9.3.ebuild |
| 49 |
+++ b/app-doc/doxygen/doxygen-1.9.3.ebuild |
| 50 |
@@ -58,6 +58,7 @@ DEPEND="${RDEPEND}" |
| 51 |
PATCHES=( |
| 52 |
"${FILESDIR}/${PN}-1.8.16-link_with_pthread.patch" |
| 53 |
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" |
| 54 |
+ "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" |
| 55 |
) |
| 56 |
|
| 57 |
DOCS=( LANGUAGE.HOWTO README.md ) |
| 58 |
|
| 59 |
diff --git a/app-doc/doxygen/doxygen-1.9.4.ebuild b/app-doc/doxygen/doxygen-1.9.4.ebuild |
| 60 |
index dde798573c04..925f54421fa8 100644 |
| 61 |
--- a/app-doc/doxygen/doxygen-1.9.4.ebuild |
| 62 |
+++ b/app-doc/doxygen/doxygen-1.9.4.ebuild |
| 63 |
@@ -58,6 +58,7 @@ DEPEND="${RDEPEND}" |
| 64 |
PATCHES=( |
| 65 |
"${FILESDIR}/${PN}-1.9.4-link_with_pthread.patch" |
| 66 |
"${FILESDIR}/${PN}-1.9.1-ignore-bad-encoding.patch" |
| 67 |
+ "${FILESDIR}/${PN}-1.9.1-do_not_force_libcxx.patch" |
| 68 |
) |
| 69 |
|
| 70 |
DOCS=( LANGUAGE.HOWTO README.md ) |
| 71 |
|
| 72 |
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 |
| 73 |
new file mode 100644 |
| 74 |
index 000000000000..f33f619e62ed |
| 75 |
--- /dev/null |
| 76 |
+++ b/app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch |
| 77 |
@@ -0,0 +1,13 @@ |
| 78 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 79 |
+index 3775ed1..b3a1af6 100644 |
| 80 |
+--- a/CMakeLists.txt |
| 81 |
++++ b/CMakeLists.txt |
| 82 |
+@@ -23,7 +23,7 @@ option(build_doc "Build user manual (HTML and PDF)" OFF) |
| 83 |
+ option(build_doc_chm "Build user manual (CHM)" OFF) |
| 84 |
+ option(use_sqlite3 "Add support for sqlite3 output [experimental]." OFF) |
| 85 |
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |
| 86 |
+- option(use_libc++ "Use libc++ as C++ standard library." ON) |
| 87 |
++ option(use_libc++ "Use libc++ as C++ standard library." OFF) |
| 88 |
+ endif() |
| 89 |
+ option(use_libclang "Add support for libclang parsing." OFF) |
| 90 |
+ option(static_libclang "Link to a statically compiled version of LLVM/libclang." OFF) |
Archives