commit: b3ed56bd4d8ab75b0ab3c7021bfc42d18675f9e7 Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 17 13:57:34 2020 +0000 Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org> CommitDate: Sat Oct 17 13:58:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ed56bd
dev-games/simgear: do not assume libc++ is used for clang Closes: https://bugs.gentoo.org/735854 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Maciej Mrozowski <reavertm <AT> gentoo.org> .../files/simgear-2020.1.2-do-not-assume-libc++-clang.patch | 12 ++++++++++++ dev-games/simgear/simgear-2020.1.2.ebuild | 1 + 2 files changed, 13 insertions(+) diff --git a/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch new file mode 100644 index 00000000000..3ff70aeebdc --- /dev/null +++ b/dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch @@ -0,0 +1,12 @@ +diff -ruN simgear-2020.1.2/CMakeLists.txt simgear-my/CMakeLists.txt +--- simgear-2020.1.2/CMakeLists.txt 2020-05-24 17:13:35.000000000 +0200 ++++ simgear-my/CMakeLists.txt 2020-10-17 15:48:58.375116913 +0200 +@@ -442,8 +442,6 @@ + set(WARNING_FLAGS_CXX "-Wall -fPIC -Wno-overloaded-virtual -Wno-redeclared-class-member") + set(WARNING_FLAGS_C "-Wall -fPIC") + set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") +- # fix Boost compilation :( +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") + + # override CMake default RelWithDebInfo flags. + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG") diff --git a/dev-games/simgear/simgear-2020.1.2.ebuild b/dev-games/simgear/simgear-2020.1.2.ebuild index 2408384dadb..c8ea38b80be 100644 --- a/dev-games/simgear/simgear-2020.1.2.ebuild +++ b/dev-games/simgear/simgear-2020.1.2.ebuild @@ -36,6 +36,7 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-2019.1.1-gdal3.patch" "${FILESDIR}/${P}-boost.patch" + "${FILESDIR}/${PN}-2020.1.2-do-not-assume-libc++-clang.patch" ) pkg_pretend() {
