github/chromebrew
1
1
Fork 0
mirror of https://github.com/chromebrew/chromebrew.git synced 2026-01-08 23:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove CREW_CMAKE_FNO_LTO_OPTIONS (#9976)

Browse Source
This commit is contained in:
Maximilian Downey Twiss
2025-02-11 09:37:57 +11:00
committed by GitHub
parent d7e8f67f2d
commit 2c346f9ce1
7 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/buildsystems/cmake.rb
View File

@@ -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|

12
lib/const.rb
View File

@@ -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}"

2
packages/libclc.rb
View File

@@ -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

2
packages/openmp.rb
View File

@@ -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

2
packages/webkit2gtk_4.rb
View File

@@ -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 \

2
packages/webkit2gtk_4_1.rb
View File

@@ -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 \

2
packages/webkitgtk_6.rb
View File

@@ -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 \