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 CEBDF15808B for ; Thu, 15 Feb 2024 15:06:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6E9EE2A1A; Thu, 15 Feb 2024 15:06:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 5179DE2A13 for ; Thu, 15 Feb 2024 15:06:41 +0000 (UTC) Message-ID: <64521f82110ca8f917fa19b415c39eb43c9bd0f8.camel@gentoo.org> Subject: Re: [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] From: =?UTF-8?Q?Micha=C5=82_G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Date: Thu, 15 Feb 2024 16:06:36 +0100 In-Reply-To: <5cYCnFBDghrqWX2Dohs3o4SjloPe1n7RZw520JNrLOs7SEK02D0K-s61UNcSnAovMjn27kbAZk2BF-VK0wQiqoj9kKb35n85IAVu5zEBxU8=@protonmail.com> References: <20240215125325.19959-1-zzam@gentoo.org> <30d6545e-c1b3-4b30-bad8-74274adbded1@gentoo.org> <79a0ee19f7a12c73cab622bfd52103ff326d5d53.camel@gentoo.org> <5cYCnFBDghrqWX2Dohs3o4SjloPe1n7RZw520JNrLOs7SEK02D0K-s61UNcSnAovMjn27kbAZk2BF-VK0wQiqoj9kKb35n85IAVu5zEBxU8=@protonmail.com> Organization: Gentoo Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-O7O66Uj4KdZ8moH4Rhgt" User-Agent: Evolution 3.50.4 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 X-Archives-Salt: 2a8b6fcb-285e-48b4-9598-dba9f6f7779f X-Archives-Hash: f80b22e16b79c232f3ec7a63b56ca9fa --=-O7O66Uj4KdZ8moH4Rhgt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2024-02-15 at 14:23 +0000, parona wrote: > On Thursday, 15 February 2024 at 16:09, Micha=C5=82 G=C3=B3rny wrote: >=20 > > 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 ca= lled > > > > > /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-st= rategy/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 v= 2 > > > > >=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 = USE > > > > 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 >=20 > The debug use flag could be dropped altogether or at least replaced with = append-cppflags -DDEBUG instead of setting CMAKE_BUILD_TYPE. The only relev= ant thing that setting CMAKE_BUILD_TYPE to Debug does is to add -DDEBUG to = CPPFLAGS. >=20 > https://github.com/search?q=3Drepo%3AWargus%2Fstratagus+%2F%23ifdef+DEBUG= %2F&type=3Dcode >=20 Oh, sorry, I've just realized that I'm maintaining stratagus these days. Will fix it, thanks! --=20 Best regards, Micha=C5=82 G=C3=B3rny --=-O7O66Uj4KdZ8moH4Rhgt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQFGBAABCgAwFiEEx2qEUJQJjSjMiybFY5ra4jKeJA4FAmXOKHwSHG1nb3JueUBn ZW50b28ub3JnAAoJEGOa2uIyniQOEkcH/jAWdpiN6jvCX3DIhYgegv6MVmQBh6nZ +dGyxNbrvX39HvyhG8pebTyiNxEjraL+ZAKP/2yKIzvjo1PAM76bs3r6u9R3adQw BFcPDXU7LzVO7N49HlNHUOkHzgug80mLwu6hs7Y/vPy3OuWVtWYFa5oQo+wfqVq6 Fd24Csuki248ByKMXRMMIkvAhIIA8ir7uIXYU+W71IkR9eevlKA45HDDQ7cGMIN4 95y0OKYUt+ldlwOnEOEDiA3wiTfMKLrmBJUUIRJjee12At4AyfhUrcXTTiuIau46 Tz98+39qhQEinQ2OmWpceFFYnt5+bMFqMCQkBuoauyvbKTm5V5ds160= =KUkk -----END PGP SIGNATURE----- --=-O7O66Uj4KdZ8moH4Rhgt--