From: parona <parona@protonmail.com>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug]
Date: Thu, 15 Feb 2024 14:23:42 +0000 [thread overview]
Message-ID: <5cYCnFBDghrqWX2Dohs3o4SjloPe1n7RZw520JNrLOs7SEK02D0K-s61UNcSnAovMjn27kbAZk2BF-VK0wQiqoj9kKb35n85IAVu5zEBxU8=@protonmail.com> (raw)
In-Reply-To: <79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org>
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
next prev parent reply other threads:[~2024-02-15 14:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 12:53 [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] Matthias Schwarzott
2024-02-15 12:59 ` Eli Schwartz
2024-02-15 13:21 ` zzam
2024-02-15 13:25 ` [gentoo-dev] [PATCH] games-engines/stratagus: Unbreak USE=debug case Matthias Schwarzott
2024-02-15 13:37 ` [gentoo-dev] [PATCH v2] " Matthias Schwarzott
2024-02-15 14:09 ` [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] Michał Górny
2024-02-15 14:23 ` parona [this message]
2024-02-15 15:06 ` Michał Górny
2024-02-15 19:10 ` zzam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='5cYCnFBDghrqWX2Dohs3o4SjloPe1n7RZw520JNrLOs7SEK02D0K-s61UNcSnAovMjn27kbAZk2BF-VK0wQiqoj9kKb35n85IAVu5zEBxU8=@protonmail.com' \
--to=parona@protonmail.com \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox