commit: bf56c1906d5f5d7dc119d812a9d0099347fc5d41 Author: Jonas Frei <freijon <AT> pm <DOT> me> AuthorDate: Sun Mar 27 16:03:39 2022 +0000 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> 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 <freijon <AT> 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" )
