commit: f79ed05fad7131325687907256b0224ba61a3431 Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun Dec 22 13:57:13 2024 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> 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 <pastalian46 <AT> 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
