From 9ccfe0bc22b253786d0a07a1da457c19982cd188 Mon Sep 17 00:00:00 2001 From: tigro Date: Tue, 27 Aug 2024 08:18:59 +0300 Subject: [PATCH] Update build requires and macros --- SPECS/webkitgtk.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/SPECS/webkitgtk.spec b/SPECS/webkitgtk.spec index 66b9b7f..20dd598 100644 --- a/SPECS/webkitgtk.spec +++ b/SPECS/webkitgtk.spec @@ -33,7 +33,7 @@ Name: webkitgtk Version: 2.44.3 -Release: %autorelease +Release: %autorelease.inferit Summary: GTK web content engine library License: LGPLv2 @@ -52,7 +52,12 @@ ExcludeArch: %{ix86} BuildRequires: bison BuildRequires: bubblewrap -BuildRequires: cmake + +# We need cmake new version cmake and macro %%limit_build +# to avoid missing debuginfo files +BuildRequires: cmake >= 3.28 +BuildRequires: epel-rpm-macros >= 9-14.el9.inferit + BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gettext @@ -335,7 +340,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %global _dwz_max_die_limit_aarch64 250000000 # Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough. -%global _find_debuginfo_opts -j15 -m 32768 +%global _find_debuginfo_opts %limit_build -m 32768 # Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more. # https://bugs.webkit.org/show_bug.cgi?id=140176 @@ -419,16 +424,16 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 export NINJA_STATUS="[1/3][%f/%t %es] " -%cmake_build -j15 +%cmake_build %limit_build -m 3072 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 export NINJA_STATUS="[2/3][%f/%t %es] " -%cmake_build -j15 +%cmake_build %limit_build -m 3072 %if %{with api40} %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 export NINJA_STATUS="[3/3][%f/%t %es] " -%cmake_build -j15 +%cmake_build %limit_build -m 3072 %endif %install @@ -619,7 +624,7 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %endif %changelog -* Sun Aug 25 2024 Arkady L. Shane - 2.44.3-2 +* Sun Aug 25 2024 Arkady L. Shane - 2.44.3-2.inferit - Rebuilt for MSVSphere 9.4 - Build w/o api40