[packages/wesnoth] - unified cmake args, strip -DNDEBUG from flags instead of using Release build type with just -O3 -

qboosh qboosh at pld-linux.org
Sun Apr 11 21:34:39 CEST 2021


commit e2caf64a0736d0160f91184f803aec35466a774a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 11 21:34:16 2021 +0200

    - unified cmake args, strip -DNDEBUG from flags instead of using Release build type with just -O3
    - now debuginfo is created

 wesnoth.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/wesnoth.spec b/wesnoth.spec
index 2943ebf..0f9526e 100644
--- a/wesnoth.spec
+++ b/wesnoth.spec
@@ -119,8 +119,6 @@ This package contains the data files for Wesnoth.
 %description data -l pl.UTF-8
 Ten pakiet zawiera pliki danych dla gry Wesnoth.
 
-%global debug_package %{nil}
-
 %prep
 %setup -q
 
@@ -135,16 +133,17 @@ Ten pakiet zawiera pliki danych dla gry Wesnoth.
 %build
 install -d build
 cd build
-%cmake \
-	.. \
-	-DCMAKE_BUILD_TYPE="Release" \
-	-DENABLE_STRICT_COMPILATION="off" \
+# override *FLAGS to remove -DNDEBUG (wesnoth depends on asserts)
+CFLAGS="%{rpmcflags}"
+CXXFLAGS="%{rpmcxxflags}"
+%cmake .. \
+	-DENABLE_STRICT_COMPILATION=OFF \
 	-DBINDIR="%{_bindir}" \
 	-DMANDIR="%{_mandir}" \
 	-DLOCALEDIR="%{_localedir}" \
-	%{!?with_server:-DENABLE_SERVER="off"} \
-	%{?with_server:-DENABLE_CAMPAIGN_SERVER="on"} \
-	%{!?with_fribidi:-DENABLE_FRIBIDI="off"}
+	%{!?with_server:-DENABLE_SERVER=OFF} \
+	%{?with_server:-DENABLE_CAMPAIGN_SERVER=ON} \
+	%{!?with_fribidi:-DENABLE_FRIBIDI=OFF}
 
 %{__make}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wesnoth.git/commitdiff/e2caf64a0736d0160f91184f803aec35466a774a



More information about the pld-cvs-commit mailing list