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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5B781580FD for ; Mon, 23 Dec 2024 03:28:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F3AB8E085B; Mon, 23 Dec 2024 03:28:58 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD3B8E085B for ; Mon, 23 Dec 2024 03:28:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FDB2340C3C for ; Mon, 23 Dec 2024 03:28:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7241818F1 for ; Mon, 23 Dec 2024 03:28:55 +0000 (UTC) From: "Rui Huang" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rui Huang" Message-ID: <1734875833.f79ed05fad7131325687907256b0224ba61a3431.vowstar@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-roguelike/cataclysm-dda/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild X-VCS-Directories: games-roguelike/cataclysm-dda/ X-VCS-Committer: vowstar X-VCS-Committer-Name: Rui Huang X-VCS-Revision: f79ed05fad7131325687907256b0224ba61a3431 X-VCS-Branch: master Date: Mon, 23 Dec 2024 03:28:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 77da4b97-3c96-4284-90a8-c89cece64b87 X-Archives-Hash: bb6cf45e0e258ee54188ea81fe2f6c6b commit: f79ed05fad7131325687907256b0224ba61a3431 Author: Takuya Wakazono gmail com> AuthorDate: Sun Dec 22 13:57:13 2024 +0000 Commit: Rui Huang gmail com> CommitDate: Sun Dec 22 13:57:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f79ed05f games-roguelike/cataclysm-dda: simplify debug USE flag Enable only backtrace with USE=debug. Closes: https://bugs.gentoo.org/946357 Signed-off-by: Takuya Wakazono gmail.com> .../cataclysm-dda/cataclysm-dda-0h.ebuild | 22 +++++++++------------ .../cataclysm-dda/cataclysm-dda-9999.ebuild | 23 +++++++++------------- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild index 512cec6e6..0f5301af3 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg toolchain-funcs flag-o-matic +inherit xdg toolchain-funcs SP_VER="2024-10-27" @@ -18,8 +18,12 @@ else v2="$(ver_cut 2)" MY_PV="$(ver_cut 1).${v2^^}" unset v2 - SRC_URI="https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz \ - soundpack? ( https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip )" + SRC_URI=" + https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz + soundpack? ( + https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip + ) + " SLOT="${MY_PV}" S="${WORKDIR}/Cataclysm-DDA-${MY_PV}-RELEASE" KEYWORDS="~amd64" @@ -104,22 +108,14 @@ src_prepare() { src_compile() { myemakeargs=( ASTYLE=0 + BACKTRACE=$(usex debug 1 0) CXX="$(tc-getCXX)" LINTJSON=0 + PCH=0 PREFIX="${EPREFIX}/usr" USE_XDG_DIR=1 ) - if use debug; then - append-ldflags "-rdynamic" - DEFINES+="-DENABLE_LOGGING" - DEFINES+="$(echo -DDEBUG_{INFO,WARNING,ERROR,PEDANTIC_INFO})" - DEFINES+="$(echo -DDEBUG_ENABLE_{MAIN,MAP,MAP_GEN,GAME})" - export DEFINES - else - export BACKTRACE=0 - fi - if use ncurses; then # don't build tests twice if ! use tiles; then diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild index cb0c90029..679c8f450 100644 --- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild +++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit xdg toolchain-funcs flag-o-matic +inherit xdg toolchain-funcs SP_VER="2024-10-27" @@ -18,8 +18,12 @@ else v2="$(ver_cut 2)" MY_PV="$(ver_cut 1).${v2^^}" unset v2 - SRC_URI="https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz \ - soundpack? ( https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip )" + SRC_URI=" + https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz + soundpack? ( + https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip + ) + " SLOT="${MY_PV}" S="${WORKDIR}/Cataclysm-DDA-${MY_PV}-RELEASE" KEYWORDS="~amd64" @@ -97,23 +101,14 @@ src_prepare() { src_compile() { myemakeargs=( - ASTYLE=0 + BACKTRACE=$(usex debug 1 0) CXX="$(tc-getCXX)" LINTJSON=0 + PCH=0 PREFIX="${EPREFIX}/usr" USE_XDG_DIR=1 ) - if use debug; then - append-ldflags "-rdynamic" - DEFINES+="-DENABLE_LOGGING" - DEFINES+="$(echo -DDEBUG_{INFO,WARNING,ERROR,PEDANTIC_INFO})" - DEFINES+="$(echo -DDEBUG_ENABLE_{MAIN,MAP,MAP_GEN,GAME})" - export DEFINES - else - export BACKTRACE=0 - fi - if use ncurses; then # don't build tests twice if ! use tiles; then