public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
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 15:09:21 +0100	[thread overview]
Message-ID: <79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org> (raw)
In-Reply-To: <30d6545e-c1b3-4b30-bad8-74274adbded1@gentoo.org>

[-- Attachment #1: Type: text/plain, Size: 2221 bytes --]

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


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 512 bytes --]

  parent reply	other threads:[~2024-02-15 14:09 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     ` Michał Górny [this message]
2024-02-15 14:23       ` [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] parona
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=79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org \
    --to=mgorny@gentoo.org \
    --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