From a5320c766051695c189adb443d14398f0af0a933238bf62fef1cf4a0ec052630 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 18 Jun 2019 07:15:56 +0000 Subject: [PATCH] Accepting request 710493 from home:marxin:branches:devel:tools:building - Make %build_ldflags conditional. OBS-URL: https://build.opensuse.org/request/show/710493 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=362 --- cmake.changes | 5 +++++ cmake.macros | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cmake.changes b/cmake.changes index 0fa8f34..1943789 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 18 07:07:37 UTC 2019 - Martin Liška + +- Make %build_ldflags conditional. + ------------------------------------------------------------------- Mon Jun 17 11:19:06 UTC 2019 - Martin Liška diff --git a/cmake.macros b/cmake.macros index 9711c9a..e168470 100644 --- a/cmake.macros +++ b/cmake.macros @@ -28,10 +28,10 @@ -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\ -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\ - -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" \\\ - -DCMAKE_STATIC_LINKER_FLAGS="%build_ldflags" \\\ + -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" \\\ + -DCMAKE_STATIC_LINKER_FLAGS="%{?build_ldflags}" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \