diff options
| author |   Jonas Frei <freijon@pm.me> | 2022-03-27 18:03:39 +0200 |
|---|---|---|
| committer | Jonas Frei <freijon@pm.me> | 2022-03-27 18:03:39 +0200 |
| commit | bf56c1906d5f5d7dc119d812a9d0099347fc5d41 (patch) | |
| tree | 4a07edc4f9995682ad738b56768fc28396de2d2c /games-engines | |
| parent | app-misc/watchexec: version bump 1.18.10 (diff) | |
| download | guru-bf56c1906d5f5d7dc119d812a9d0099347fc5d41.tar.gz guru-bf56c1906d5f5d7dc119d812a9d0099347fc5d41.tar.bz2 guru-bf56c1906d5f5d7dc119d812a9d0099347fc5d41.zip | |
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@pm.me>
Diffstat (limited to 'games-engines')
| -rw-r--r-- | games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch | 14 | ||||
| -rw-r--r-- | games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild (renamed from games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild) | 1 |
2 files changed, 15 insertions, 0 deletions
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 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" ) |