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 B5A4015808B for ; Thu, 15 Feb 2024 13:21:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF6A42BC01E; Thu, 15 Feb 2024 13:21:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 76DC6E2A2E for ; Thu, 15 Feb 2024 13:21:47 +0000 (UTC) Message-ID: <30d6545e-c1b3-4b30-bad8-74274adbded1@gentoo.org> Date: Thu, 15 Feb 2024 14:21:44 +0100 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 User-Agent: Mozilla Thunderbird From: zzam@gentoo.org Subject: Re: [gentoo-dev] [PATCH] games-strategy/wargus: Fix running it with games-engines/stratagus[debug] Content-Language: en-GB To: gentoo-dev@lists.gentoo.org References: <20240215125325.19959-1-zzam@gentoo.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Archives-Salt: 869fb9ab-eecc-464c-9b95-5b38b883252d X-Archives-Hash: 00fb06b573613bb0b3dd309c655cbb1e 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 >> --- >> 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