From e1450897b2a78ba3c570862b1a469211c46bce66fdd025533d016d7bf90d9e1e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sat, 4 Jun 2022 08:14:02 +0000 Subject: [PATCH] Accepting request 979615 from home:jengelh:branches:devel:tools:building - Edit cmake.macros: Stop injecting -DNDEBUG at the end of CFLAGS. It's impossible to override by re-setting CFLAGS, and if it were really wanted globally, it should be in %optflags instead. OBS-URL: https://build.opensuse.org/request/show/979615 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=491 --- cmake.changes | 8 ++++++++ cmake.macros | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake.changes b/cmake.changes index 5fbe51f..8732b59 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 28 18:54:48 UTC 2022 - Jan Engelhardt + +- Edit cmake.macros: Stop injecting -DNDEBUG at the end of + CFLAGS. It's impossible to override by re-setting CFLAGS, and + if it were really wanted globally, it should be in %optflags + instead. + ------------------------------------------------------------------- Wed Apr 13 20:48:21 UTC 2022 - Dirk Müller diff --git a/cmake.macros b/cmake.macros index df5f638..42ef8f5 100644 --- a/cmake.macros +++ b/cmake.macros @@ -26,9 +26,9 @@ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \\\ -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} \\\ -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ + -DCMAKE_C_FLAGS="${CFLAGS:-%optflags}" \\\ + -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags}" \\\ + -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" \\\ -DCMAKE_EXE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ -DCMAKE_MODULE_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed" \\\ -DCMAKE_SHARED_LINKER_FLAGS="%{?build_ldflags} -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\