From c65c2dc33e4e078eb0196538e1d61a7edd196f1073cd206a137242209c9b1682 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 17 Jun 2019 13:03:51 +0000 Subject: [PATCH] Accepting request 710337 from home:marxin:branches:devel:tools:building - Add -DCMAKE_STATIC_LINKER_FLAGS. - Add %build_ldflags to all LINKER_FLAGS. OBS-URL: https://build.opensuse.org/request/show/710337 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=361 --- cmake.changes | 6 ++++++ cmake.macros | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cmake.changes b/cmake.changes index 98439d2..0fa8f34 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 17 11:19:06 UTC 2019 - Martin Liška + + - Add -DCMAKE_STATIC_LINKER_FLAGS. + - Add %build_ldflags to all LINKER_FLAGS. + ------------------------------------------------------------------- Fri Jun 14 00:54:57 UTC 2019 - Avindra Goolcharan diff --git a/cmake.macros b/cmake.macros index 33c3c2f..9711c9a 100644 --- a/cmake.macros +++ b/cmake.macros @@ -28,9 +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="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -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 \