| 1 |
commit: bf56c1906d5f5d7dc119d812a9d0099347fc5d41 |
| 2 |
Author: Jonas Frei <freijon <AT> pm <DOT> me> |
| 3 |
AuthorDate: Sun Mar 27 16:03:39 2022 +0000 |
| 4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 5 |
CommitDate: Sun Mar 27 16:03:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bf56c190 |
| 7 |
|
| 8 |
games-engines/fs2_open: Added patch to fix linker QA issue |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/836249 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Jonas Frei <freijon <AT> pm.me> |
| 13 |
|
| 14 |
.../files/fs2_open-21.4.1-dont-override-ldflags.patch | 14 ++++++++++++++ |
| 15 |
...fs2_open-21.4.1-r1.ebuild => fs2_open-21.4.1-r2.ebuild} | 1 + |
| 16 |
2 files changed, 15 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 000000000..c75458ded |
| 21 |
--- /dev/null |
| 22 |
+++ b/games-engines/fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch |
| 23 |
@@ -0,0 +1,14 @@ |
| 24 |
+--- fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2021-11-01 18:00:53.000000000 +0100 |
| 25 |
++++ fs2_open-21.4.1/cmake/toolchain-gcc.cmake 2022-03-27 17:52:26.738107292 +0200 |
| 26 |
+@@ -27,6 +27,11 @@ |
| 27 |
+ set(COMPILER_FLAGS "") |
| 28 |
+ set(LINKER_FLAGS "") |
| 29 |
+ |
| 30 |
++# For C and C++, the values can be overwritten independently |
| 31 |
++if(DEFINED ENV{LDFLAGS}) |
| 32 |
++ set(LINKER_FLAGS $ENV{LDFLAGS}) |
| 33 |
++endif() |
| 34 |
++ |
| 35 |
+ if (GCC_USE_GOLD) |
| 36 |
+ OPTION(GCC_INCREMENTAL_LINKING "Use incremental linking" OFF) |
| 37 |
+ set(LINKER_FLAGS "${LINKER_FLAGS} -fuse-ld=gold") |
| 38 |
|
| 39 |
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 |
| 40 |
similarity index 97% |
| 41 |
rename from games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild |
| 42 |
rename to games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild |
| 43 |
index d96915f96..2d1b5f674 100644 |
| 44 |
--- a/games-engines/fs2_open/fs2_open-21.4.1-r1.ebuild |
| 45 |
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild |
| 46 |
@@ -44,6 +44,7 @@ RDEPEND="${DEPEND}" |
| 47 |
BDEPEND="" |
| 48 |
PATCHES=( |
| 49 |
"${FILESDIR}/${P}-dont-build-lz4.patch" |
| 50 |
+ "${FILESDIR}/${P}-dont-override-ldflags.patch" |
| 51 |
"${FILESDIR}/${P}-make-arch-independent.patch" |
| 52 |
"${FILESDIR}/${P}-version-fix.patch" |
| 53 |
) |
Archives