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 BE43F1382C5 for ; Mon, 1 Mar 2021 10:56:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C348CE0957; Mon, 1 Mar 2021 10:56:58 +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 AFD51E0957 for ; Mon, 1 Mar 2021 10:56:58 +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 F193834117A for ; Mon, 1 Mar 2021 10:56:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 756BD533 for ; Mon, 1 Mar 2021 10:56:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1614596205.c0ca48ec9827893cd6ab278bd09bbc0865f61630.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/0ad/0ad-0.0.24b_alpha.ebuild games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch X-VCS-Directories: games-strategy/0ad/ games-strategy/0ad/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c0ca48ec9827893cd6ab278bd09bbc0865f61630 X-VCS-Branch: master Date: Mon, 1 Mar 2021 10:56:55 +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: 23b86615-67e2-41e2-80a4-ce04fe4733af X-Archives-Hash: 7b362f685947e7e1e093abf1d87700fb commit: c0ca48ec9827893cd6ab278bd09bbc0865f61630 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 10:54:33 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 1 10:56:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ca48ec games-strategy/0ad: fix AR/RANLIB usage Closes: https://bugs.gentoo.org/773511 Closes: https://bugs.gentoo.org/773502 Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 5 ++-- .../0ad/files/0ad-0.0.24b_alpha-respect-tc.patch | 32 ++++++++++++++++++++++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild index 2e003b33f53..e7596872128 100644 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild @@ -76,6 +76,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch + "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch ) pkg_setup() { @@ -106,7 +107,7 @@ src_configure() { --datadir="/usr/share/${PN}" ) - tc-export CC CXX + tc-export AR CC CXX RANLIB # Stock premake5 does not work, use the shipped one # TODO: revisit this, see above BDEPEND note re premake5 @@ -132,8 +133,6 @@ src_configure() { } src_compile() { - tc-export AR - # Build 3rd party fcollada einfo "Building bundled fcollada" emake -C libraries/source/fcollada/src diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch new file mode 100644 index 00000000000..7503ffc001b --- /dev/null +++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch @@ -0,0 +1,32 @@ +--- a/libraries/source/fcollada/src/Makefile ++++ b/libraries/source/fcollada/src/Makefile +@@ -7,6 +7,7 @@ + PIC_FLAGS ?= -fpic + endif + ++AR? ?= ar + CXX ?= g++ + CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) + CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL +@@ -16,6 +17,7 @@ + LIBS += `pkg-config libxml-2.0 --libs` + INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` + INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) ++RANLIB ?= ranlib + + # FCollada is not aliasing-safe, so disallow dangerous optimisations + # (TODO: It'd be nice to fix FCollada, but that looks hard) +@@ -246,11 +248,11 @@ + + output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs + @echo "$@" +- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@ ++ @$(AR) -cr $@ $(OBJECTS_DEBUG); $(RANLIB) $@ + + output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs + @echo "$@" +- @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@ ++ @$(AR) -cr $@ $(OBJECTS_RELEASE); $(RANLIB) $@ + + output/FColladaTest: $(OBJECTS_TEST) | output_dirs + $(CXX) -o $@ $(OBJECTS_TEST) $(LIBS) $(LDFLAGS_TEST)