From 4c37ec68726c7cceecaafbd0f9a06a02fbf4ff5e792d71a7b6ddc4d5eacfebef Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 8 Apr 2022 11:48:49 +0000 Subject: [PATCH] - speed up build of :mini flavor by using external zstd (part of 0-Bootstrap) and turn off LTO OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=487 --- cmake.changes | 6 ++++++ cmake.spec | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/cmake.changes b/cmake.changes index 18953fc..197698c 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 8 11:48:04 UTC 2022 - Dirk Müller + +- speed up build of :mini flavor by using external zstd (part of 0-Bootstrap) + and turn off LTO + ------------------------------------------------------------------- Tue Mar 29 19:18:02 UTC 2022 - Christoph G diff --git a/cmake.spec b/cmake.spec index 0743cee..b62df3e 100644 --- a/cmake.spec +++ b/cmake.spec @@ -75,6 +75,7 @@ BuildRequires: pkgconfig(libssl) %if %{suse_version} > 1500 BuildRequires: pkgconfig(libuv) >= 1.28 %endif +BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) %if "%{flavor}" == "" @@ -94,7 +95,6 @@ Requires: this-is-only-for-build-envs BuildRequires: pkgconfig(jsoncpp) >= 1.4.1 BuildRequires: pkgconfig(libarchive) >= 3.3.3 BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libzstd) %endif %if %{with gui} BuildRequires: python3-Sphinx @@ -136,10 +136,15 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'` %{SOURC %autosetup -p1 -n cmake-%{version} %build -cp %{SOURCE99} . -%if "%{flavor}" != "" +cp -p %{SOURCE99} . +%if %{with mini} +# this is serial, so it takes too much time for the mini package +%define _find_debuginfo_dwz_opts %{nil} +%define _lto_cflags %{nil} +%endif export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" +export CXXFLAGS="$CFLAGS" +%if "%{flavor}" != "" # This is not autotools configure ./configure \ --prefix=%{_prefix} \ @@ -152,7 +157,6 @@ export CXXFLAGS="%{optflags}" --no-system-nghttp2 \ --no-system-jsoncpp \ --no-system-libarchive \ - --no-system-zstd \ %endif --parallel=0%{jobs} \ --verbose \