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 06D0E158090 for ; Sat, 14 May 2022 20:40:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3CF18E0896; Sat, 14 May 2022 20:40:28 +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 21268E0896 for ; Sat, 14 May 2022 20:40:28 +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 13D873417ED for ; Sat, 14 May 2022 20:40:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71B80441 for ; Sat, 14 May 2022 20:40:25 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1652560820.03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/doxygen/files/, app-doc/doxygen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-doc/doxygen/doxygen-1.9.1.ebuild app-doc/doxygen/doxygen-1.9.2.ebuild app-doc/doxygen/doxygen-1.9.3.ebuild app-doc/doxygen/doxygen-1.9.4.ebuild app-doc/doxygen/files/doxygen-1.9.1-do_not_force_libcxx.patch X-VCS-Directories: app-doc/doxygen/files/ app-doc/doxygen/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115 X-VCS-Branch: master Date: Sat, 14 May 2022 20:40:25 +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: 76993c9a-2831-4169-acba-9bd20239e73a X-Archives-Hash: 5ec7265d7ad25b94b1292824f2b25c71 commit: 03f0bf4cdacfe0c0ce7fb7e5efe62d2b61b42115 Author: Matthias Maier gentoo org> AuthorDate: Sat May 14 20:37:58 2022 +0000 Commit: Matthias Maier gentoo 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 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)