[gentoo-commits] repo/proj/guru:master commit in: games-engines/fs2_open/files/, games-engines/fs2_open/

[Ronny Gutbrod]

commit:     362eb9a02bd4ea5450480edf44578018b7a2af51
Author:     Jonas Frei <freijon <AT> pm <DOT> me>
AuthorDate: Mon Mar 28 05:20:04 2022 +0000
Commit:     Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon Mar 28 05:20:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=362eb9a0

games-engines/fs2_open: Added 'debug' USE flag

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Jonas Frei <freijon <AT> pm.me>

 .../fs2_open/files/fs2_open-21.4.1-dont-override-ldflags.patch   | 2 +-
 games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild                 | 9 +++++++--
 games-engines/fs2_open/metadata.xml                              | 1 +
 3 files changed, 9 insertions(+), 3 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
index 7a45e1fda..74554ec8e 100644
--- 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
@@ -4,7 +4,7 @@
  set(COMPILER_FLAGS "")
  set(LINKER_FLAGS "")
  
-+# For C and C++, the values can be overwritten independently
++# Don't ignore user-set LDFLAGS
 +if(DEFINED ENV{LDFLAGS})
 +    set(LINKER_FLAGS $ENV{LDFLAGS})
 +endif()

diff --git a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild 
b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
index d8305b305..beadddcbb 100644
--- a/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
+++ b/games-engines/fs2_open/fs2_open-21.4.1-r2.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 LICENSE="Unlicense MIT Boost-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="discord"
+IUSE="debug discord"
 
 DEPEND="
        app-arch/lz4
@@ -64,11 +64,16 @@ src_prepare() {
        use discord || eapply "${FILESDIR}/${P}-disable-discord.patch"
        eapply_user
        cmake_src_prepare
+       use debug && CMAKE_BUILD_TYPE=Debug
 }
 
 src_install() {
        exeinto "/opt/${PN}"
-       doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+       if use debug ; then
+               doexe "${BUILD_DIR}/bin/${PN}_${_PV}-DEBUG"
+       else
+               doexe "${BUILD_DIR}/bin/${PN}_${_PV}"
+       fi
        insinto "/opt/${PN}"
        doins "${BUILD_DIR}/bin/libRocketControls.so"
        doins "${BUILD_DIR}/bin/libRocketControlsLua.so"

diff --git a/games-engines/fs2_open/metadata.xml 
b/games-engines/fs2_open/metadata.xml
index b1d632ca1..aef4fd67c 100644
--- a/games-engines/fs2_open/metadata.xml
+++ b/games-engines/fs2_open/metadata.xml
@@ -16,6 +16,7 @@
                
<bugs-to>https://github.com/scp-fs2open/fs2open.github.com/issues</bugs-to>
        </upstream>
        <use>
+               <flag name="debug">Debug build to collect logfiles</flag>
                <flag name="discord">Enable Discord RPC support</flag>
        </use>
 </pkgmetadata>