From 303c3d7affde82c592ba24bd90d87980921fdd50c928c67481c577c3e1b2bc50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 20 Aug 2014 10:46:19 +0000 Subject: [PATCH] - Also pass -Wl,-z,now lets see if that is passable :) OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=170 --- cmake.changes | 5 +++++ cmake.macros | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cmake.changes b/cmake.changes index f743d0a..1eaced3 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 20 10:45:49 UTC 2014 - tchvatal@suse.com + +- Also pass -Wl,-z,now lets see if that is passable :) + ------------------------------------------------------------------- Mon Aug 18 23:09:38 UTC 2014 - hrvoje.senjan@gmail.com diff --git a/cmake.macros b/cmake.macros index 85d1665..7063ad0 100644 --- a/cmake.macros +++ b/cmake.macros @@ -20,9 +20,9 @@ -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" \\\ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined" \\\ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \\\ %if "%{?_lib}" == "lib64" \ -DLIB_SUFFIX=64 \\\ %endif \ @@ -36,10 +36,10 @@ -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake" %make_jobs \ - %{__make} %{?_smp_mflags} VERBOSE=1 + %__make %{?_smp_mflags} VERBOSE=1 %cmake_install \ - make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C build \ + %__make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C build %ctest \ cd build \