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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DA5E138359 for ; Sun, 15 Nov 2020 20:03:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AC9DE0919; Sun, 15 Nov 2020 20:03:41 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4793DE0919 for ; Sun, 15 Nov 2020 20:03:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EFC73412B6 for ; Sun, 15 Nov 2020 20:03:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CD4D462 for ; Sun, 15 Nov 2020 20:03:35 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1605470576.79d173ed34da3b7669cbc945767a57df1f7d50e2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/wesnoth/, games-strategy/wesnoth/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/wesnoth/files/wesnoth-1.14.14-ar.patch games-strategy/wesnoth/wesnoth-1.14.14.ebuild games-strategy/wesnoth/wesnoth-1.15.4.ebuild X-VCS-Directories: games-strategy/wesnoth/ games-strategy/wesnoth/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 79d173ed34da3b7669cbc945767a57df1f7d50e2 X-VCS-Branch: master Date: Sun, 15 Nov 2020 20:03:35 +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: 47c6a36f-da47-4031-8a00-5d77d448cf13 X-Archives-Hash: 3bdc9fc6d323463d5129ad41641a048a commit: 79d173ed34da3b7669cbc945767a57df1f7d50e2 Author: Alexey Sokolov google com> AuthorDate: Sun Nov 15 20:02:56 2020 +0000 Commit: David Seifert gentoo 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 asokolov.org> Signed-off-by: David Seifert 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