Mailing List Archive: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug]

[PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug]

Feb 15, 2024, 4:53 AM

Post #1 of 7 (78 views)

When stratagus is compiled with USE=debug, its executable is called
/usr/bin/stratatgus-dbg.

Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
---
games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
index fff6023fa177..3295b2911d48 100644
--- a/games-strategy/wargus/wargus-3.3.2.ebuild
+++ b/games-strategy/wargus/wargus-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8
@@ -46,10 +46,12 @@ pkg_pretend() {
}

src_configure() {
+ local suffix=
+ has_version games-engines/stratagus[debug] && suffix=-dbg
local mycmakeargs=(
-DGAMEDIR="${EPREFIX}/usr/bin"
-DBINDIR="${EPREFIX}/usr/bin"
- -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
+ -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
-DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-DWITH_STORMLIB=$(usex bne)
--
2.43.1

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

eschwartz93 at gmail

Feb 15, 2024, 4:59 AM

Post #2 of 7 (78 views)

Permalink

On 2/15/24 7:53 AM, Matthias Schwarzott wrote:
> When stratagus is compiled with USE=debug, its executable is called
> /usr/bin/stratatgus-dbg.
>
> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> ---
> games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
> index fff6023fa177..3295b2911d48 100644
> --- a/games-strategy/wargus/wargus-3.3.2.ebuild
> +++ b/games-strategy/wargus/wargus-3.3.2.ebuild
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2022 Gentoo Authors
> +# Copyright 1999-2024 Gentoo Authors
> # Distributed under the terms of the GNU General Public License v2
>
> EAPI=8
> @@ -46,10 +46,12 @@ pkg_pretend() {
> }
>
> src_configure() {
> + local suffix=
> + has_version games-engines/stratagus[debug] && suffix=-dbg
> local mycmakeargs=(
> -DGAMEDIR="${EPREFIX}/usr/bin"
> -DBINDIR="${EPREFIX}/usr/bin"
> - -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
> + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
> -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
> -DICONDIR=/usr/share/icons/hicolor/64x64/apps
> -DWITH_STORMLIB=$(usex bne)

Ok so this just means the package will be broken if you change the USE
flags for stratagus and wargus doesn't get rebuilt.

Why is the executable name different, anyway?

--
Eli Schwartz

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

zzam at gentoo

Feb 15, 2024, 5:21 AM

Post #3 of 7 (78 views)

Permalink

Am 15.02.24 um 13:59 schrieb Eli Schwartz:
> On 2/15/24 7:53 AM, Matthias Schwarzott wrote:
>> When stratagus is compiled with USE=debug, its executable is called
>> /usr/bin/stratatgus-dbg.
>>
>> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
>> ---
>> games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
>> index fff6023fa177..3295b2911d48 100644
>> --- a/games-strategy/wargus/wargus-3.3.2.ebuild
>> +++ b/games-strategy/wargus/wargus-3.3.2.ebuild
>> @@ -1,4 +1,4 @@
>> -# Copyright 1999-2022 Gentoo Authors
>> +# Copyright 1999-2024 Gentoo Authors
>> # Distributed under the terms of the GNU General Public License v2
>>
>> EAPI=8
>> @@ -46,10 +46,12 @@ pkg_pretend() {
>> }
>>
>> src_configure() {
>> + local suffix=
>> + has_version games-engines/stratagus[debug] && suffix=-dbg
>> local mycmakeargs=(
>> -DGAMEDIR="${EPREFIX}/usr/bin"
>> -DBINDIR="${EPREFIX}/usr/bin"
>> - -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
>> + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
>> -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
>> -DICONDIR=/usr/share/icons/hicolor/64x64/apps
>> -DWITH_STORMLIB=$(usex bne)
>
>
>
> Ok so this just means the package will be broken if you change the USE
> flags for stratagus and wargus doesn't get rebuilt.
>
Exactly. It would even be simpler to patch that renaming out. I will
send a change to stratagus-ebuild.

> Why is the executable name different, anyway?
>
I have no clue. My guess is to have a separate executable.

This is from stratagus CMakeLists.txt:
==== cut ===
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
endif()
==== cut ===

Matthias

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

mgorny at gentoo

Feb 15, 2024, 6:09 AM

Post #4 of 7 (78 views)

Permalink

On Thu, 2024-02-15 at 14:21 +0100, zzam@gentoo.org wrote:
> Am 15.02.24 um 13:59 schrieb Eli Schwartz:
> > On 2/15/24 7:53 AM, Matthias Schwarzott wrote:
> > > When stratagus is compiled with USE=debug, its executable is called
> > > /usr/bin/stratatgus-dbg.
> > >
> > > Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> > > ---
> > > games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
> > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > index fff6023fa177..3295b2911d48 100644
> > > --- a/games-strategy/wargus/wargus-3.3.2.ebuild
> > > +++ b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > @@ -1,4 +1,4 @@
> > > -# Copyright 1999-2022 Gentoo Authors
> > > +# Copyright 1999-2024 Gentoo Authors
> > > # Distributed under the terms of the GNU General Public License v2
> > >
> > > EAPI=8
> > > @@ -46,10 +46,12 @@ pkg_pretend() {
> > > }
> > >
> > > src_configure() {
> > > + local suffix=
> > > + has_version games-engines/stratagus[debug] && suffix=-dbg
> > > local mycmakeargs=(
> > > -DGAMEDIR="${EPREFIX}/usr/bin"
> > > -DBINDIR="${EPREFIX}/usr/bin"
> > > - -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
> > > + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
> > > -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
> > > -DICONDIR=/usr/share/icons/hicolor/64x64/apps
> > > -DWITH_STORMLIB=$(usex bne)
> >
> >
> >
> > Ok so this just means the package will be broken if you change the USE
> > flags for stratagus and wargus doesn't get rebuilt.
> >
> Exactly. It would even be simpler to patch that renaming out. I will
> send a change to stratagus-ebuild.
>
> > Why is the executable name different, anyway?
> >
> I have no clue. My guess is to have a separate executable.
>
> This is from stratagus CMakeLists.txt:
> ==== cut ===
> if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
> endif()
> ==== cut ===
>

Wait, why are we changing CMAKE_BUILD_TYPE in the first place?!

--
Best regards,
Micha? Górny

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

parona at protonmail

Feb 15, 2024, 6:23 AM

Post #5 of 7 (75 views)

Permalink

On Thursday, 15 February 2024 at 16:09, Micha? Górny <mgorny@gentoo.org> wrote:

> On Thu, 2024-02-15 at 14:21 +0100, zzam@gentoo.org wrote:
>
> > Am 15.02.24 um 13:59 schrieb Eli Schwartz:
> >
> > > On 2/15/24 7:53 AM, Matthias Schwarzott wrote:
> > >
> > > > When stratagus is compiled with USE=debug, its executable is called
> > > > /usr/bin/stratatgus-dbg.
> > > >
> > > > Signed-off-by: Matthias Schwarzott zzam@gentoo.org
> > > > ---
> > > > games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
> > > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > index fff6023fa177..3295b2911d48 100644
> > > > --- a/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > +++ b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > @@ -1,4 +1,4 @@
> > > > -# Copyright 1999-2022 Gentoo Authors
> > > > +# Copyright 1999-2024 Gentoo Authors
> > > > # Distributed under the terms of the GNU General Public License v2
> > > >
> > > > EAPI=8
> > > > @@ -46,10 +46,12 @@ pkg_pretend() {
> > > > }
> > > >
> > > > src_configure() {
> > > > + local suffix=
> > > > + has_version games-engines/stratagus[debug] && suffix=-dbg
> > > > local mycmakeargs=(
> > > > -DGAMEDIR="${EPREFIX}/usr/bin"
> > > > -DBINDIR="${EPREFIX}/usr/bin"
> > > > - -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
> > > > + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
> > > > -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
> > > > -DICONDIR=/usr/share/icons/hicolor/64x64/apps
> > > > -DWITH_STORMLIB=$(usex bne)
> > >
> > > Ok so this just means the package will be broken if you change the USE
> > > flags for stratagus and wargus doesn't get rebuilt.
> >
> > Exactly. It would even be simpler to patch that renaming out. I will
> > send a change to stratagus-ebuild.
> >
> > > Why is the executable name different, anyway?
> >
> > I have no clue. My guess is to have a separate executable.
> >
> > This is from stratagus CMakeLists.txt:
> > ==== cut ===
> > if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> > set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
> > endif()
> > ==== cut ===
>
>
> Wait, why are we changing CMAKE_BUILD_TYPE in the first place?!
>

The debug use flag could be dropped altogether or at least replaced with append-cppflags -DDEBUG instead of setting CMAKE_BUILD_TYPE. The only relevant thing that setting CMAKE_BUILD_TYPE to Debug does is to add -DDEBUG to CPPFLAGS.

https://github.com/search?q=repo%3AWargus%2Fstratagus+%2F%23ifdef+DEBUG%2F&type=code

--
Alfred Wingate

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

mgorny at gentoo

Feb 15, 2024, 7:06 AM

Post #6 of 7 (75 views)

Permalink

On Thu, 2024-02-15 at 14:23 +0000, parona wrote:
> On Thursday, 15 February 2024 at 16:09, Micha? Górny <mgorny@gentoo.org> wrote:
>
> > On Thu, 2024-02-15 at 14:21 +0100, zzam@gentoo.org wrote:
> >
> > > Am 15.02.24 um 13:59 schrieb Eli Schwartz:
> > >
> > > > On 2/15/24 7:53 AM, Matthias Schwarzott wrote:
> > > >
> > > > > When stratagus is compiled with USE=debug, its executable is called
> > > > > /usr/bin/stratatgus-dbg.
> > > > >
> > > > > Signed-off-by: Matthias Schwarzott zzam@gentoo.org
> > > > > ---
> > > > > games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++--
> > > > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > > index fff6023fa177..3295b2911d48 100644
> > > > > --- a/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > > +++ b/games-strategy/wargus/wargus-3.3.2.ebuild
> > > > > @@ -1,4 +1,4 @@
> > > > > -# Copyright 1999-2022 Gentoo Authors
> > > > > +# Copyright 1999-2024 Gentoo Authors
> > > > > # Distributed under the terms of the GNU General Public License v2
> > > > >
> > > > > EAPI=8
> > > > > @@ -46,10 +46,12 @@ pkg_pretend() {
> > > > > }
> > > > >
> > > > > src_configure() {
> > > > > + local suffix=
> > > > > + has_version games-engines/stratagus[debug] && suffix=-dbg
> > > > > local mycmakeargs=(
> > > > > -DGAMEDIR="${EPREFIX}/usr/bin"
> > > > > -DBINDIR="${EPREFIX}/usr/bin"
> > > > > - -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus"
> > > > > + -DSTRATAGUS="${EPREFIX}/usr/bin/stratagus${suffix}"
> > > > > -DSHAREDIR="${EPREFIX}/usr/share/stratagus/wargus"
> > > > > -DICONDIR=/usr/share/icons/hicolor/64x64/apps
> > > > > -DWITH_STORMLIB=$(usex bne)
> > > >
> > > > Ok so this just means the package will be broken if you change the USE
> > > > flags for stratagus and wargus doesn't get rebuilt.
> > >
> > > Exactly. It would even be simpler to patch that renaming out. I will
> > > send a change to stratagus-ebuild.
> > >
> > > > Why is the executable name different, anyway?
> > >
> > > I have no clue. My guess is to have a separate executable.
> > >
> > > This is from stratagus CMakeLists.txt:
> > > ==== cut ===
> > > if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> > > set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
> > > endif()
> > > ==== cut ===
> >
> >
> > Wait, why are we changing CMAKE_BUILD_TYPE in the first place?!
> >
>
> The debug use flag could be dropped altogether or at least replaced with append-cppflags -DDEBUG instead of setting CMAKE_BUILD_TYPE. The only relevant thing that setting CMAKE_BUILD_TYPE to Debug does is to add -DDEBUG to CPPFLAGS.
>
> https://github.com/search?q=repo%3AWargus%2Fstratagus+%2F%23ifdef+DEBUG%2F&type=code
>

Oh, sorry, I've just realized that I'm maintaining stratagus these days.
Will fix it, thanks!

--
Best regards,
Micha? Górny

Re: [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] [ In reply to ]

zzam at gentoo

Feb 15, 2024, 11:10 AM

Post #7 of 7 (73 views)

Permalink

Am 15.02.24 um 16:06 schrieb Micha? Górny:
>
> Oh, sorry, I've just realized that I'm maintaining stratagus these days.
> Will fix it, thanks!
>
Good. Your solution also fixes this issue.
Thank you for committing it.

I "just" wanted to debug why wargus crashes.
This is already fruitful. I already found and fixed a couple of issues
(without touching the crashing part yet :-) ).

To see if it is better with the master-branch, I locally created
live-ebuilds and started to fix some build-system issues first.

Regards
Matthias

Mailing List Archive

Attached Files:

Attached Files:

Attached Files: