From 8d8e6690bc50faecc892cc2c609491699fd80e48 Mon Sep 17 00:00:00 2001 From: "Satadru Pramanik, DO, MPH, MEng" Date: Thu, 9 Feb 2023 18:04:32 -0500 Subject: [PATCH] Use -flto=auto instead of -flto (#7909) --- lib/const.rb | 6 +++--- packages/aha.rb | 2 +- packages/beav.rb | 2 +- packages/bz2.rb | 6 +++--- packages/ffmpeg.rb | 4 ++-- packages/gtksourceview_4.rb | 2 +- packages/gtksourceview_5.rb | 2 +- packages/gusb.rb | 2 +- packages/libpcap.rb | 2 +- packages/lmdb.rb | 2 +- packages/nano.rb | 2 +- packages/ruby.rb | 2 +- packages/ucl.rb | 2 +- packages/wget.rb | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/const.rb b/lib/const.rb index 19e33a80a8..572ab14381 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.30.9' +CREW_VERSION = '1.31.0' # kernel architecture KERN_ARCH = `uname -m`.chomp @@ -195,9 +195,9 @@ CREW_LINKER = if ENV['CREW_LINKER'].to_s.empty? CREW_LINKER_FLAGS = ENV.fetch('CREW_LINKER_FLAGS', nil) CREW_CORE_FLAGS = "-O2 -pipe -ffat-lto-objects -fPIC #{CREW_ARCH_FLAGS} -fuse-ld=#{CREW_LINKER} #{CREW_LINKER_FLAGS}" -CREW_COMMON_FLAGS = "#{CREW_CORE_FLAGS} -flto" +CREW_COMMON_FLAGS = "#{CREW_CORE_FLAGS} -flto=auto" CREW_COMMON_FNO_LTO_FLAGS = "#{CREW_CORE_FLAGS} -fno-lto" -CREW_LDFLAGS = "-flto #{CREW_LINKER_FLAGS}" +CREW_LDFLAGS = "-flto=auto #{CREW_LINKER_FLAGS}" CREW_FNO_LTO_LDFLAGS = '-fno-lto' CREW_ENV_OPTIONS_HASH = if CREW_DISABLE_ENV_OPTIONS diff --git a/packages/aha.rb b/packages/aha.rb index b20ea62429..900de8abfe 100644 --- a/packages/aha.rb +++ b/packages/aha.rb @@ -23,7 +23,7 @@ class Aha < Package }) def self.patch - system "sed -i 's:-Wextra:-Wextra -pipe -flto -O2:g' Makefile" + system "sed -i 's:-Wextra:-Wextra -pipe -flto=auto -O2:g' Makefile" system "sed -i 's:PREFIX?=/usr/local:PREFIX?=#{CREW_PREFIX}:g' Makefile" end diff --git a/packages/beav.rb b/packages/beav.rb index 0ca408a6f0..461352d573 100644 --- a/packages/beav.rb +++ b/packages/beav.rb @@ -32,7 +32,7 @@ class Beav < Package system "sed -i '76d' random.c" system "sed -i '11d' symbol.c" system "sed -i 's:#include :#include :' tcap.c" - system "sed -i 's,-g -DUNIX -Wall,-g -DUNIX -Wall -flto,g' Makefile" + system "sed -i 's,-g -DUNIX -Wall,-g -DUNIX -Wall -flto=auto,g' Makefile" end def self.build diff --git a/packages/bz2.rb b/packages/bz2.rb index 0336b20cf4..507f2eb877 100644 --- a/packages/bz2.rb +++ b/packages/bz2.rb @@ -25,9 +25,9 @@ class Bz2 < Package depends_on 'glibc' # R def self.patch - system "sed -i 's,^LDFLAGS=,LDFLAGS=-flto,' Makefile" - system "sed -i 's,^CFLAGS=-Wall,CFLAGS=-Wall -flto,' Makefile" - system "sed -i 's,^CFLAGS=-fpic,CFLAGS=-fpic -flto,' Makefile-libbz2_so" + system "sed -i 's,^LDFLAGS=,LDFLAGS=-flto=auto,' Makefile" + system "sed -i 's,^CFLAGS=-Wall,CFLAGS=-Wall -flto=auto,' Makefile" + system "sed -i 's,^CFLAGS=-fpic,CFLAGS=-fpic -flto=auto,' Makefile-libbz2_so" end def self.build diff --git a/packages/ffmpeg.rb b/packages/ffmpeg.rb index cd6ed3a4ca..76eb1be679 100644 --- a/packages/ffmpeg.rb +++ b/packages/ffmpeg.rb @@ -122,12 +122,12 @@ class Ffmpeg < Package @arch_cflags = '' when 'x86_64' @mfx = '--enable-libmfx' - @lto = '-flto' + @lto = '-flto=auto' @enablelto = '--enable-lto' @arch_cflags = '' when 'aarch64', 'armv7l' @mfx = '' - @lto = '-flto' + @lto = '-flto=auto' @enablelto = '--enable-lto' @arch_cflags = '-mfloat-abi=hard -mthumb -mfpu=neon -march=armv7-a+fp' end diff --git a/packages/gtksourceview_4.rb b/packages/gtksourceview_4.rb index 6296590f54..41d027db52 100644 --- a/packages/gtksourceview_4.rb +++ b/packages/gtksourceview_4.rb @@ -44,7 +44,7 @@ class Gtksourceview_4 < Package depends_on 'zlibpkg' # R def self.patch - system "sed -i 's/-fstack-protector-strong/-flto/g' meson.build" + system "sed -i 's/-fstack-protector-strong/-flto=auto/g' meson.build" end def self.build diff --git a/packages/gtksourceview_5.rb b/packages/gtksourceview_5.rb index 67da40d77a..fd6189698a 100644 --- a/packages/gtksourceview_5.rb +++ b/packages/gtksourceview_5.rb @@ -44,7 +44,7 @@ class Gtksourceview_5 < Package depends_on 'pcre2' # R def self.patch - system "sed -i 's/-fstack-protector-strong/-flto/g' meson.build" + system "sed -i 's/-fstack-protector-strong/-flto=auto/g' meson.build" end def self.build diff --git a/packages/gusb.rb b/packages/gusb.rb index c430c5a8da..b0a627b6ce 100644 --- a/packages/gusb.rb +++ b/packages/gusb.rb @@ -29,7 +29,7 @@ class Gusb < Package depends_on 'gobject_introspection' def self.patch - system "sed -i 's/-fstack-protector-strong/-flto/g' meson.build" + system "sed -i 's/-fstack-protector-strong/-flto=auto/g' meson.build" end def self.build diff --git a/packages/libpcap.rb b/packages/libpcap.rb index b5f5eedf9a..f3a08783db 100644 --- a/packages/libpcap.rb +++ b/packages/libpcap.rb @@ -25,7 +25,7 @@ class Libpcap < Package depends_on 'libnl3' def self.build - system "CFLAGS='-I#{CREW_PREFIX}/include/libnl3 -flto -fuse-ld=gold' ./configure #{CREW_OPTIONS}" + system "CFLAGS='-I#{CREW_PREFIX}/include/libnl3 -flto=auto -fuse-ld=gold' ./configure #{CREW_OPTIONS}" system 'make' end diff --git a/packages/lmdb.rb b/packages/lmdb.rb index a4de1b82f5..1b499c41ee 100644 --- a/packages/lmdb.rb +++ b/packages/lmdb.rb @@ -28,7 +28,7 @@ class Lmdb < Package def self.patch system "sed -i 's,libdir = $(exec_prefix)/lib,libdir = $(exec_prefix)/lib#{CREW_LIB_SUFFIX},g' libraries/liblmdb/Makefile" system "sed -i 's,prefix = /usr/local,prefix = #{CREW_PREFIX},g' libraries/liblmdb/Makefile" - system "sed -i 's,OPT = -O2 -g,OPT = -O2 -g -flto,g' libraries/liblmdb/Makefile" + system "sed -i 's,OPT = -O2 -g,OPT = -O2 -g -flto=auto,g' libraries/liblmdb/Makefile" end def self.build diff --git a/packages/nano.rb b/packages/nano.rb index e17a072dbd..6c96ea4458 100644 --- a/packages/nano.rb +++ b/packages/nano.rb @@ -30,7 +30,7 @@ class Nano < Package end def self.build - system "CFLAGS=-flto LDFLAGS=-static \ + system "CFLAGS=-flto=auto LDFLAGS=-static \ ./configure #{CREW_OPTIONS} \ --enable-threads=posix \ --enable-nls \ diff --git a/packages/ruby.rb b/packages/ruby.rb index 14213e4fee..cc095346ae 100644 --- a/packages/ruby.rb +++ b/packages/ruby.rb @@ -45,7 +45,7 @@ class Ruby < Package system '[ -x configure ] || autoreconf -fiv' system "RUBY_TRY_CFLAGS='stack_protector=no' \ RUBY_TRY_LDFLAGS='stack_protector=no' \ - optflags='-flto -fuse-ld=#{CREW_LINKER}' \ + optflags='-flto=auto -fuse-ld=#{CREW_LINKER}' \ ./configure #{CREW_OPTIONS} \ --enable-shared \ #{@yjit} \ diff --git a/packages/ucl.rb b/packages/ucl.rb index b38db3368a..89111e09b3 100644 --- a/packages/ucl.rb +++ b/packages/ucl.rb @@ -25,7 +25,7 @@ class Ucl < Package }) def self.build - system "env CFLAGS='-pipe -std=gnu90 -fPIC -flto' \ + system "env CFLAGS='-pipe -std=gnu90 -fPIC -flto=auto' \ ./configure #{CREW_OPTIONS} \ --enable-shared \ --enable-static" diff --git a/packages/wget.rb b/packages/wget.rb index 3f0679f75c..83d1064592 100644 --- a/packages/wget.rb +++ b/packages/wget.rb @@ -34,7 +34,7 @@ class Wget < Package def self.build puts 'libiconv installed, Will build with libiconv.'.yellow if File.exist?("#{CREW_LIB_PREFIX}/libcharset.so") - @lto = ARCH == 'i686' ? '' : '-flto' + @lto = ARCH == 'i686' ? '' : '-flto=auto' @cc = ARCH == 'i686' ? 'clang' : 'gcc' system './bootstrap --skip-po --no-git --gnulib-srcdir=./gnulib' system "CFLAGS='-O2 -pipe #{@lto} -fPIC' LDFLAGS=#{@lto} CC=#{@cc} LD=mold \