diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /dev-games/simgear | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'dev-games/simgear')
| -rw-r--r-- | dev-games/simgear/Manifest | 3 | ||||
| -rw-r--r-- | dev-games/simgear/files/simgear-2020.1.2-do-not-assume-libc++-clang.patch | 12 | ||||
| -rw-r--r-- | dev-games/simgear/simgear-2020.1.2.ebuild | 1 |
3 files changed, 15 insertions, 1 deletions
diff --git a/dev-games/simgear/Manifest b/dev-games/simgear/Manifest index 7a7583a649c3..ae9fd41309d5 100644 --- a/dev-games/simgear/Manifest +++ b/dev-games/simgear/Manifest @@ -1,6 +1,7 @@ AUX simgear-2019.1.1-gdal3.patch 388 BLAKE2B 364d5f6692809c67d73a3191f387cbd9735e7183a25696e612827c1a796c872ee5d4a09085fa8a24a0fd524725fdeca9303c5c5ee71981de054ab5a8833d5285 SHA512 44d59cf379c8c7d82b87a31a4d29dd02aaa865c37f12c7e565c641bf3fb14497f4d63b69bbc973551b53d74919ddce5495e3f29b598ed87a6a4565e22ec81667 AUX simgear-2020.1.2-boost.patch 299 BLAKE2B e62fa6dd8cd88306e5cc1b043f5bc174fd64b228517d7dc48c32f5174de807af073ef0b41aa00aa3567d91dd0a2571bfbc036dda4da2135e208b076185d42448 SHA512 bdbf7e15927d62a1e78486ca6ecdd7a9f7306f5d4e0fe2fad7de18556758b3c92d8cf794c309e4a66f8b3b96941de5b0ff1a3266e136518c2da6f1198c2eada8 +AUX simgear-2020.1.2-do-not-assume-libc++-clang.patch 629 BLAKE2B 1ce89c84f6ac94d7f29a3d9fc8b66cd972dcca809188ac487f7b1d961b9bad6ecdaf31882e5a0beb239cf2fb0d946bff7c5838dca7ac7872cbab22480a7b7aed SHA512 a294c55b84331bdabdea5d950b5a9a53c17eb4b949a863cb0b77c9dd585cb6a43b74f86323e1cc4de48564e064927cd49d7dec032361e50f75bfc82351319a26 DIST simgear-2020.1.2.tar.bz2 1393059 BLAKE2B 62fa15d88368177e23cf52edf51e8c56252399d8f2661e518911c1093a0d7f9f11069da8d65b479f2d4b45792dcd011194e57fa99ac3991f749e8196aaff9552 SHA512 c2e835de471f374a6c33cfd1769b7079d178ee66075bfe87cc9eb1f06dc2648db93c31f62f0ac7a664703406817cb1e909a531812cb76c99cd8751eb7e6782e7 -EBUILD simgear-2020.1.2.ebuild 1571 BLAKE2B 18c0d444f7839f2bb259d5591ae9679368480a68809b9bb25ac9a620eab412cc94d88ec5c55d49a1c7b5124aee4ddc3061a52decb9628b6bd21e78730a740fbc SHA512 648be7da517c9e298951848a680afa45b8be574480d58cadbf4b08b3e030177a7752370b80a403021f97c079727ac44e4f7496cf05649cd64952e3b9a8dc235b +EBUILD simgear-2020.1.2.ebuild 1634 BLAKE2B 0bc81b0d4a0b2bdcdc87d0291774943827804be5e6519303e7c356a936abad003bdf097bd2a627475a22a8a01da2151c808716a1d11bb87e558082ca355aceaa SHA512 f150a4b40b863afd0e1ca46bda8bf594f52a03d0ca90d878c33849a452008a5e757a5d0709d5fe179ff0c52e315c0309cb1097973b9ade1b6c0773cc8574c3f4 EBUILD simgear-9999.ebuild 1601 BLAKE2B 2abe5a461a36bc073eb134133a2b648fd1b699441e99730bad0f01497c4005d492f7363dcb1e59f4325e6b2a709f53f6365a9b227b9bd9f5b2dce916d4c608bd SHA512 37a6cc57913c1a5d4d313748bafe6f93eb55c1c35c6c5389f2f65dba67d13504cebcac050e5d867e0021689f8d77c30b4986a8e3f1525c6becd32cd823119c44 MISC metadata.xml 911 BLAKE2B 978dd6e83dce780a6b6250e86def3f5f3052d7c09cda9d4974ec9f63d151cb0040c9434cde00007a8821b28854d2c49c5a040e29f176d1ebb91600e97ba09f17 SHA512 59839dd8b60cbf26b548157edf6f30255c2ca81545df77d39d47cebbf2eec561014c698ac15028765921fb9a7a570f5032f699f71fc135c5bbad211ce6b0a5a8 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 000000000000..3ff70aeebdc5 --- /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 2408384dadbc..c8ea38b80be6 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() { |