commit cmake for openSUSE:Factory
Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2014-08-25 11:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2014-08-20 17:51:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2014-08-25 11:03:06.000000000 +0200 @@ -1,0 +2,18 @@ +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 + +- Import some cmake handing from kf5- and kde4- filesystem to macros: + * Simplify debug build handling in macros. Whether debug is on + or off is known to optflags + * Don't build in release mode, that cramps optimization flags; + instead pass wanted flags directly + * Pass -Wl,--as-needed -Wl,--no-undefined to linker, to avoid + unneeded libs, and to disallow undefined symbols + * Add a %make_jobs macro with verbose argument + * Simplify %cmake_install invocation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ cmake.spec: same change ++++++ cmake.macros ++++++ --- /var/tmp/diff_new_pack.2xkak2/_old 2014-08-25 11:03:07.000000000 +0200 +++ /var/tmp/diff_new_pack.2xkak2/_new 2014-08-25 11:03:07.000000000 +0200 @@ -3,18 +3,12 @@ # %__cmake %{_bindir}/cmake %__ctest %{_bindir}/ctest -%_cmake_debug %{?with_debug:debug}%{?!with_debug:release} %cmake \ - CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \ - CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \ - FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \ find . -name CMakeLists.txt \\\ -exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} + \ mkdir -p build \ cd build \ - %define enable_debug 1 \ - %{?_enable_debug: %{expand: %%global enable_debug 1}} \ %__cmake .. \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\ -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ @@ -22,7 +16,13 @@ -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\ - -DCMAKE_BUILD_TYPE=%{_cmake_debug} \\\ + -DCMAKE_BUILD_TYPE=None \\\ + -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 -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 \ @@ -35,10 +35,11 @@ -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\ -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake" +%make_jobs \ + %__make %{?_smp_mflags} VERBOSE=1 + %cmake_install \ - cd build \ - make DESTDIR=%{buildroot} install/fast \ - cd .. + %__make VERBOSE=1 DESTDIR=%{buildroot} install/fast -C build %ctest \ cd build \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de