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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1927515808B for ; Sun, 27 Mar 2022 16:03:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52600E0876; Sun, 27 Mar 2022 16:03:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2DFA6E0876 for ; Sun, 27 Mar 2022 16:03:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AF69343601 for ; Sun, 27 Mar 2022 16:03:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 936B22B0 for ; Sun, 27 Mar 2022 16:03:49 +0000 (UTC) From: "Jonas Frei" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonas Frei" Message-ID: <1648397019.bf56c1906d5f5d7dc119d812a9d0099347fc5d41.freijon@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-engines/fs2_open/, games-engines/fs2_open/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild X-VCS-Directories: games-engines/fs2_open/files/ games-engines/fs2_open/ X-VCS-Committer: freijon X-VCS-Committer-Name: Jonas Frei X-VCS-Revision: bf56c1906d5f5d7dc119d812a9d0099347fc5d41 X-VCS-Branch: dev Date: Sun, 27 Mar 2022 16:03:49 +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: 52df0ea1-315b-47da-a7e3-507f8d7a6b4f X-Archives-Hash: a08d9bdd5c24d7f4b4ceb8fb7765661c commit: bf56c1906d5f5d7dc119d812a9d0099347fc5d41 Author: Jonas Frei pm me> AuthorDate: Sun Mar 27 16:03:39 2022 +0000 Commit: Jonas Frei pm me> CommitDate: Sun Mar 27 16:03:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf56c190 games-engines/fs2_open: Added patch to fix linker QA issue Closes: https://bugs.gentoo.org/836249 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jonas Frei pm.me> .../files/fs2_open-21.4.1-dont-override-ldflags.patch | 14 ++++++++++++++ ...fs2_open-21.4.1-r1.ebuild => fs2_open-21.4.1-r2.ebuild} | 1 + 2 files changed, 15 insertions(+) diff --git a/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch new file mode 100644 index 000000000..c75458ded --- /dev/null +++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch @@ -0,0 +1,14 @@ +--- fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.000000000 +0100 ++++ fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2022-03-27 17:52:26.738107292 +0200 +@@ -27,6 +27,11 @@ + set(COMPILER_FLAGS "") + set(LINKER_FLAGS "") + ++# For C and C++, the values can be overwritten independently ++if(DEFINED ENV{LDFLAGS}) ++ set(LINKER_FLAGS $ENV{LDFLAGS}) ++endif() ++ + if (GCC_USE_GOLD) + OPTION(GCC_INCREMENTAL_LINKING "Use incremental linking" OFF) + set(LINKER_FLAGS "${LINKER_FLAGS} -fuse-ld=gold") diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild similarity index 97% rename from games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild rename to games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild index d96915f96..2d1b5f674 100644 --- a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild +++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild @@ -44,6 +44,7 @@ RDEPEND="${DEPEND}" BDEPEND="" PATCHES=( "${FILESDIR}/${P}-dont-build-lz4.patch" + "${FILESDIR}/${P}-dont-override-ldflags.patch" "${FILESDIR}/${P}-make-arch-independent.patch" "${FILESDIR}/${P}-version-fix.patch" )