From 2c346f9ce1bf5c9e4e97f438e2abaef5e284d44b Mon Sep 17 00:00:00 2001 From: Maximilian Downey Twiss Date: Tue, 11 Feb 2025 09:37:57 +1100 Subject: [PATCH] Remove CREW_CMAKE_FNO_LTO_OPTIONS (#9976) --- lib/buildsystems/cmake.rb | 2 +- lib/const.rb | 12 ------------ packages/libclc.rb | 2 +- packages/openmp.rb | 2 +- packages/webkit2gtk_4.rb | 2 +- packages/webkit2gtk_4_1.rb | 2 +- packages/webkitgtk_6.rb | 2 +- 7 files changed, 6 insertions(+), 18 deletions(-) diff --git a/lib/buildsystems/cmake.rb b/lib/buildsystems/cmake.rb index cd9b7da5c..08e56ad36 100644 --- a/lib/buildsystems/cmake.rb +++ b/lib/buildsystems/cmake.rb @@ -5,7 +5,7 @@ class CMake < Package def self.build @cmake_build_relative_dir ||= '.' - @crew_cmake_options = @no_lto ? CREW_CMAKE_FNO_LTO_OPTIONS : CREW_CMAKE_OPTIONS + @crew_cmake_options = @no_lto ? CREW_CMAKE_OPTIONS.gsub('-flto=auto', '-fno-lto').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '') : CREW_CMAKE_OPTIONS puts 'Additional cmake options being used:'.orange method_list = methods.grep(/cmake_/).delete_if { |i| send(i).blank? } method_list.each do |method| diff --git a/lib/const.rb b/lib/const.rb index b1c3a544a..b65ec0ab1 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -268,7 +268,6 @@ CREW_NINJA ||= ENV.fetch('CREW_NINJA', 'ninja') unless defined?(CREW_NINJA) # Cmake sometimes wants to use LIB_SUFFIX to install libs in LIB64, so specify such for x86_64 # This is often considered deprecated. See discussio at https://gitlab.kitware.com/cmake/cmake/-/issues/18640 # and also https://bugzilla.redhat.com/show_bug.cgi?id=1425064 -# Let's have two CREW_CMAKE_OPTIONS since this avoids the logic in the recipe file. CREW_CMAKE_OPTIONS ||= <<~OPT.chomp -DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} \ -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} \ @@ -281,17 +280,6 @@ CREW_CMAKE_OPTIONS ||= <<~OPT.chomp -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE \ -DCMAKE_BUILD_TYPE=Release OPT -CREW_CMAKE_FNO_LTO_OPTIONS ||= <<~OPT.chomp - -DCMAKE_INSTALL_PREFIX=#{CREW_PREFIX} \ - -DCMAKE_LIBRARY_PATH=#{CREW_LIB_PREFIX} \ - -DCMAKE_C_FLAGS='#{CREW_COMMON_FNO_LTO_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \ - -DCMAKE_CXX_FLAGS='#{CREW_COMMON_FNO_LTO_FLAGS.gsub(/-fuse-ld=.{2,4}\s/, '')}' \ - -DCMAKE_EXE_LINKER_FLAGS=#{CREW_FNO_LTO_LDFLAGS} \ - -DCMAKE_LINKER_TYPE=#{CREW_LINKER.upcase} \ - -DCMAKE_SHARED_LINKER_FLAGS=#{CREW_FNO_LTO_LDFLAGS} \ - -DCMAKE_MODULE_LINKER_FLAGS=#{CREW_FNO_LTO_LDFLAGS} \ - -DCMAKE_BUILD_TYPE=Release -OPT CREW_CMAKE_LIBSUFFIX_OPTIONS ||= "#{CREW_CMAKE_OPTIONS} -DLIB_SUFFIX=#{CREW_LIB_SUFFIX}" diff --git a/packages/libclc.rb b/packages/libclc.rb index d474fee12..629c30b3d 100644 --- a/packages/libclc.rb +++ b/packages/libclc.rb @@ -52,7 +52,7 @@ class Libclc < Package def self.build @cmake_options = case ARCH when 'i686', 'x86_64' - CREW_CMAKE_FNO_LTO_OPTIONS.gsub('-fno-lto', '') + CREW_CMAKE_OPTIONS.gsub('-flto=auto', '').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '') else CREW_CMAKE_OPTIONS end diff --git a/packages/openmp.rb b/packages/openmp.rb index 56162df7a..ad147040e 100644 --- a/packages/openmp.rb +++ b/packages/openmp.rb @@ -55,7 +55,7 @@ class Openmp < Package def self.build @cmake_options = case ARCH when 'i686', 'x86_64' - CREW_CMAKE_FNO_LTO_OPTIONS.gsub('-fno-lto', '') + CREW_CMAKE_OPTIONS.gsub('-flto=auto', '').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '') else CREW_CMAKE_OPTIONS end diff --git a/packages/webkit2gtk_4.rb b/packages/webkit2gtk_4.rb index 9be5e1cec..979bd177d 100644 --- a/packages/webkit2gtk_4.rb +++ b/packages/webkit2gtk_4.rb @@ -144,7 +144,7 @@ class Webkit2gtk_4 < Package @arch_linker_flags = ARCH == 'x86_64' ? '' : '-Wl,--no-keep-memory' system "CREW_LINKER_FLAGS='#{@arch_linker_flags}' CC='#{@workdir}/bin/gcc' CXX='#{@workdir}/bin/g++' \ cmake -B builddir -G Ninja \ - #{CREW_CMAKE_FNO_LTO_OPTIONS.gsub('mold', 'gold').sub('-pipe', '-pipe -Wno-error').gsub('-fno-lto', '')} \ + #{CREW_CMAKE_OPTIONS.sub('-pipe', '-pipe -Wno-error').gsub('-flto=auto', '').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '')} \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_DOCUMENTATION=OFF \ diff --git a/packages/webkit2gtk_4_1.rb b/packages/webkit2gtk_4_1.rb index a56c0d53b..46750b87f 100644 --- a/packages/webkit2gtk_4_1.rb +++ b/packages/webkit2gtk_4_1.rb @@ -96,7 +96,7 @@ class Webkit2gtk_4_1 < Package @arch_linker_flags = ARCH == 'x86_64' ? '' : '-Wl,--no-keep-memory' system "CREW_LINKER_FLAGS='#{@arch_linker_flags}' \ cmake -B builddir -G Ninja \ - #{CREW_CMAKE_FNO_LTO_OPTIONS.sub('-pipe', '-pipe -Wno-error').gsub('-fno-lto', '')} \ + #{CREW_CMAKE_OPTIONS.sub('-pipe', '-pipe -Wno-error').gsub('-flto=auto', '').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '')} \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_DOCUMENTATION=OFF \ diff --git a/packages/webkitgtk_6.rb b/packages/webkitgtk_6.rb index 24890362d..117ad8e62 100644 --- a/packages/webkitgtk_6.rb +++ b/packages/webkitgtk_6.rb @@ -148,7 +148,7 @@ class Webkitgtk_6 < Package @arch_linker_flags = ARCH == 'x86_64' ? '' : '-Wl,--no-keep-memory' system "CREW_LINKER_FLAGS='#{@arch_linker_flags}' CC='#{@workdir}/bin/gcc' CXX='#{@workdir}/bin/g++' \ cmake -B builddir -G Ninja \ - #{CREW_CMAKE_FNO_LTO_OPTIONS.gsub('-DCMAKE_LINKER_TYPE=MOLD', '').sub('-pipe', '-pipe -Wno-error').gsub('-fno-lto', '')} \ + #{CREW_CMAKE_OPTIONS.sub('-pipe', '-pipe -Wno-error').gsub('-flto=auto', '').sub('-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=TRUE', '')} \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DENABLE_DOCUMENTATION=OFF \