From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A741915808B for ; Thu, 15 Feb 2024 14:23:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0DBB5E2A26; Thu, 15 Feb 2024 14:23:50 +0000 (UTC) Received: from mail-4325.protonmail.ch (mail-4325.protonmail.ch [185.70.43.25]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF3ADE29E9 for ; Thu, 15 Feb 2024 14:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1708007027; x=1708266227; bh=HDxc8s3m1W45lVPplbPRXHONjRlL0i0GYtmVT3kxtBQ=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=FCgoaVvp6Fa60wkRbpkfh6V6LC2y/MHX9/+G9TT75sgleSRkLWtALpVaSLpF/G+gK vJGE83rVw3R77p/lFIYr1rX7CFlvdGTX1uxQhUhSpBcHqCOUTF6Opk0gEzD7ZoOlYA kVb2YCpipF8/mGO3ho32dhQXkgVejahfqTeHq9ItZzCbQwV0yjslfQAHRtHRd/Qv+k L7oFNtkTElWyI9Ucju0f46m0dwC3GT9fPhq8I/oBUXCejG7LZD3BjayRdVOcT3A5tS S3ClFISuy3BcE5m+0XoR6HSjZ9caKh8DnI21+G50UMCLNEwngRhSRfd+txAWCn9EaU tZyM3H42/oXjA== Date: Thu, 15 Feb 2024 14:23:42 +0000 To: gentoo-dev@lists.gentoo.org From: parona Subject: Re: [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] Message-ID: <5cYCnFBDghrqWX2Dohs3o4SjloPe1n7RZw520JNrLOs7SEK02D0K-s61UNcSnAovMjn27kbAZk2BF-VK0wQiqoj9kKb35n85IAVu5zEBxU8=@protonmail.com> In-Reply-To: <79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org> References: <20240215125325.19959-1-zzam@gentoo.org> <30d6545e-c1b3-4b30-bad8-74274adbded1@gentoo.org> <79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org> Feedback-ID: 25092314:user:proton Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4250cd83-255c-4429-90fd-cae1e5e9e4e6 X-Archives-Hash: 0a46d692ed877f93db8ae77f90c82b46 On Thursday, 15 February 2024 at 16:09, Micha=C5=82 G=C3=B3rny wrote: > On Thu, 2024-02-15 at 14:21 +0100, zzam@gentoo.org wrote: >=20 > > Am 15.02.24 um 13:59 schrieb Eli Schwartz: > >=20 > > > On 2/15/24 7:53 AM, Matthias Schwarzott wrote: > > >=20 > > > > When stratagus is compiled with USE=3Ddebug, its executable is call= ed > > > > /usr/bin/stratatgus-dbg. > > > >=20 > > > > Signed-off-by: Matthias Schwarzott zzam@gentoo.org > > > > --- > > > > games-strategy/wargus/wargus-3.3.2.ebuild | 6 ++++-- > > > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > >=20 > > > > diff --git a/games-strategy/wargus/wargus-3.3.2.ebuild b/games-stra= tegy/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 > > > >=20 > > > > EAPI=3D8 > > > > @@ -46,10 +46,12 @@ pkg_pretend() { > > > > } > > > >=20 > > > > src_configure() { > > > > + local suffix=3D > > > > + has_version games-engines/stratagus[debug] && suffix=3D-dbg > > > > local mycmakeargs=3D( > > > > -DGAMEDIR=3D"${EPREFIX}/usr/bin" > > > > -DBINDIR=3D"${EPREFIX}/usr/bin" > > > > - -DSTRATAGUS=3D"${EPREFIX}/usr/bin/stratagus" > > > > + -DSTRATAGUS=3D"${EPREFIX}/usr/bin/stratagus${suffix}" > > > > -DSHAREDIR=3D"${EPREFIX}/usr/share/stratagus/wargus" > > > > -DICONDIR=3D/usr/share/icons/hicolor/64x64/apps > > > > -DWITH_STORMLIB=3D$(usex bne) > > >=20 > > > Ok so this just means the package will be broken if you change the US= E > > > flags for stratagus and wargus doesn't get rebuilt. > >=20 > > Exactly. It would even be simpler to patch that renaming out. I will > > send a change to stratagus-ebuild. > >=20 > > > Why is the executable name different, anyway? > >=20 > > I have no clue. My guess is to have a separate executable. > >=20 > > This is from stratagus CMakeLists.txt: > > =3D=3D=3D=3D cut =3D=3D=3D > > if(CMAKE_BUILD_TYPE STREQUAL "Debug") > > set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg) > > endif() > > =3D=3D=3D=3D cut =3D=3D=3D >=20 >=20 > Wait, why are we changing CMAKE_BUILD_TYPE in the first place?! >=20 The debug use flag could be dropped altogether or at least replaced with ap= pend-cppflags -DDEBUG instead of setting CMAKE_BUILD_TYPE. The only relevan= t thing that setting CMAKE_BUILD_TYPE to Debug does is to add -DDEBUG to CP= PFLAGS. https://github.com/search?q=3Drepo%3AWargus%2Fstratagus+%2F%23ifdef+DEBUG%2= F&type=3Dcode -- Alfred Wingate