commit: 79d173ed34da3b7669cbc945767a57df1f7d50e2 Author: Alexey Sokolov <sokolov <AT> google <DOT> com> AuthorDate: Sun Nov 15 20:02:56 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Nov 15 20:02:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d173ed
games-strategy/wesnoth: fix build without native-symlinks Closes: https://bugs.gentoo.org/732096 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Signed-off-by: David Seifert <soap <AT> gentoo.org> games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch | 14 ++++++++++++++ games-strategy/wesnoth/wesnoth-1.14.14.ebuild | 4 ++++ games-strategy/wesnoth/wesnoth-1.15.4.ebuild | 4 ++++ 3 files changed, 22 insertions(+) diff --git a/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch new file mode 100644 index 00000000000..4a7c8cf41e7 --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch @@ -0,0 +1,14 @@ +Leave default AR as is, https://bugs.gentoo.org/732096 + +diff -r 419bf3de54e5 CMakeLists.txt +--- a/CMakeLists.txt Sat Oct 24 19:50:25 2020 +0000 ++++ b/CMakeLists.txt Sat Oct 24 19:50:53 2020 +0000 +@@ -390,8 +390,6 @@ + MESSAGE("Using ar, ranlib, and default linker") + find_program(NON_LTO_AR NAMES ar) + find_program(NON_LTO_RANLIB NAMES ranlib) +- set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE) +- set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support LTO" FORCE) + endif() + MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB) + diff --git a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild index 407e3840468..e259a887936 100644 --- a/games-strategy/wesnoth/wesnoth-1.14.14.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.14.14.ebuild @@ -46,6 +46,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/wesnoth-1.14.14-ar.patch" +) + src_prepare() { cmake_src_prepare diff --git a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild index 407e3840468..e259a887936 100644 --- a/games-strategy/wesnoth/wesnoth-1.15.4.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.15.4.ebuild @@ -46,6 +46,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/wesnoth-1.14.14-ar.patch" +) + src_prepare() { cmake_src_prepare
