Upstream has a new lto build option, let's cautiously stay out of it's way while we review our more thorough approach

3 files changed, 9 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f16ffd8948c..7d4da7fac35f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = makepkg-optimize
 	pkgdesc = Supplemental build and packaging optimizations for makepkg
-	pkgver = 18
-	pkgrel = 4
+	pkgver = 19
+	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Makepkg-optimize
 	arch = any
 	license = GPL
@@ -12,7 +12,6 @@ pkgbase = makepkg-optimize
 	optdepends = openmp: Parallelize loops
 	backup = etc/makepkg-optimize.conf
 	source = pgo.sh.in
-	source = ZZ-lto.sh.in
 	source = graphite.sh.in
 	source = rice.sh.in
 	source = upx-exec.sh.in
@@ -33,9 +32,8 @@ pkgbase = makepkg-optimize
 	source = pkgopts-param_ext.conf
 	source = compress-param_max.conf
 	sha1sums = 4c5f0be71638a6ec2f18c01675d99f19eb6dd45d
-	sha1sums = 61c765080f3d41dbae15be9212667f9e6364550b
 	sha1sums = d7a3801037333c582dba976db27cf8896bc1b401
-	sha1sums = c99d9cb49dd31924a1cb298bcfe142cef31a9fd3
+	sha1sums = c40dd9d5e60a939861de6f17a94aca965d3f57f3
 	sha1sums = a893c32f2a3fff8b279025ec60f0c3d88143dc1e
 	sha1sums = 9270b5e33d4508a959688a10c20dec3732763937
 	sha1sums = 34a33b47a8b667f9dc810737c0f598660b962d4c
@@ -48,11 +46,10 @@ pkgbase = makepkg-optimize
 	sha1sums = eef21d80145bf64133206beba26fd7fab5a8f5bc
 	sha1sums = 2e2cd8c680a86518652543fda9092bf2ab594660
 	sha1sums = 981eab856abb43c5e093620cdf4d8bfa2d690805
-	sha1sums = 540ce964ef6f3bdda1d7b7fd6297866b1ee895b1
+	sha1sums = bce04a9513419bc70ae9b61bb70aa40528334eca
 	sha1sums = efb3ed7d7d5516259709149d7bcd6ec208c07593
 	sha1sums = 1fc8035e64b739e20c70fbb4eaa5cb7aa1c63c90
 	sha1sums = 5d0cde13b50641371e4ec4d813d6b2dfae493889
 	sha1sums = 67801619b39ea4542829a4b715034a9f7ac7cf2c
 
 pkgname = makepkg-optimize
-
diff --git a/PKGBUILD b/PKGBUILD
index 08356b188a09..71d7b9baf842 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: bartus ( aur\at\bartus.33mail.com )
 
 pkgname=makepkg-optimize
-pkgver=18
-pkgrel=4
+pkgver=19
+pkgrel=1
 pkgdesc='Supplemental build and packaging optimizations for makepkg'
 arch=('any')
 license=('GPL')
@@ -14,7 +14,7 @@ optdepends=("upx: Compress executables"
             "svgo: Optimize SVG files"
             "openmp: Parallelize loops")
 backup=(etc/makepkg-optimize.conf)
-_buildenv=({pgo,ZZ-lto,graphite,rice}.sh.in)
+_buildenv=({pgo,graphite,rice}.sh.in)
 _executable=({upx,optipng,svgo}-exec.sh.in)
 _tidy=({upx,optipng,svgo}.sh.in)
 _conf=({{c,cxx,make,ld,debug-make,cmake-}flags,{buildenv,destdirs,pkgopts{,-param}}_ext,compress-param_max}.conf)
@@ -23,9 +23,8 @@ source=(${_buildenv[@]}
         ${_tidy[@]}
         ${_conf[@]})
 sha1sums=('4c5f0be71638a6ec2f18c01675d99f19eb6dd45d'
-          '61c765080f3d41dbae15be9212667f9e6364550b'
           'd7a3801037333c582dba976db27cf8896bc1b401'
-          'c99d9cb49dd31924a1cb298bcfe142cef31a9fd3'
+          'c40dd9d5e60a939861de6f17a94aca965d3f57f3'
           'a893c32f2a3fff8b279025ec60f0c3d88143dc1e'
           '9270b5e33d4508a959688a10c20dec3732763937'
           '34a33b47a8b667f9dc810737c0f598660b962d4c'
@@ -38,7 +37,7 @@ sha1sums=('4c5f0be71638a6ec2f18c01675d99f19eb6dd45d'
           'eef21d80145bf64133206beba26fd7fab5a8f5bc'
           '2e2cd8c680a86518652543fda9092bf2ab594660'
           '981eab856abb43c5e093620cdf4d8bfa2d690805'
-          '540ce964ef6f3bdda1d7b7fd6297866b1ee895b1'
+          'bce04a9513419bc70ae9b61bb70aa40528334eca'
           'efb3ed7d7d5516259709149d7bcd6ec208c07593'
           '1fc8035e64b739e20c70fbb4eaa5cb7aa1c63c90'
           '5d0cde13b50641371e4ec4d813d6b2dfae493889'
diff --git a/buildenv_ext.conf b/buildenv_ext.conf
index caa8c939e2cb..e21aff679186 100644
--- a/buildenv_ext.conf
+++ b/buildenv_ext.conf
@@ -1,5 +1,3 @@
-#-- lto{,-clang}:      Use monolithic link-time optimization (use "lto-clang" for clang/llvm)
-#-- lto-thin{,-clang}: Use partitioned link-time optimization (use "lto-thin-clang" for clang/llvm)
 #-- pgo:               Generate or utilize profile guided optimization (requires two build and install cycles)
 #-- {graphite,polly}:  Use polyhedral model optimization (use "polly" for clang/llvm)
 #-- rice{,-clang}:     Use extreme and unsafe optimization (use "rice-clang" for clang/llvm)