[arch-commits] Commit in devtools/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, March 6, 2022 @ 18:09:19
  Author: foutrelis
Revision: 439199

upgpkg: devtools 20220207-2: set LTOFLAGS="-flto=auto"

Needs pacman 6.0.1-4 which backported support for LTOFLAGS.

Added:
  devtools/trunk/makepkg.conf-set-LTOFLAGS-flto-auto.patch
Modified:
  devtools/trunk/PKGBUILD

-------------------------------------------+
 PKGBUILD                                  |   17 +++++++++++++----
 makepkg.conf-set-LTOFLAGS-flto-auto.patch |   25 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-06 18:05:32 UTC (rev 439198)
+++ PKGBUILD	2022-03-06 18:09:19 UTC (rev 439199)
@@ -3,7 +3,7 @@
 
 pkgname=devtools
 pkgver=20220207
-pkgrel=1
+pkgrel=2
 pkgdesc='Tools for Arch Linux package maintainers'
 arch=('any')
 license=('GPL')
@@ -13,7 +13,8 @@
 makedepends=('asciidoc')
 optdepends=('btrfs-progs: btrfs support')
 source=(${url}/uploads/1b4a7f5876d24a4d26370f4f81d8f636/devtools-${pkgver}.tar.gz
-        ${url}/uploads/070f070114e57b8111f0afe72f2c1585/devtools-${pkgver}.tar.gz.sig)
+        ${url}/uploads/070f070114e57b8111f0afe72f2c1585/devtools-${pkgver}.tar.gz.sig
+        makepkg.conf-set-LTOFLAGS-flto-auto.patch)
 validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53'
               '4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC'
               '86CFFCA918CF3AF47147588051E8B148A9999C34'
@@ -24,10 +25,18 @@
               '6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'
               'E240B57E2C4630BA768E2F26FC1B547C8D8172C8')
 sha256sums=('189716b7041057554d6d7ffed0cd05184f5fb03c67c8d12b74b0771df2dbf828'
-            'SKIP')
+            'SKIP'
+            '1bd579ad29943b54c3a60b93369c5185bdac670cd01440a3ca7b43f64145230c')
 b2sums=('334c434868f3769765b8e05cde1b825433322725247d6cb1509993cca980a2f02a55c763b0e4d6bd53988bb4630d86785ccbe636b842e7103c93a43d1036e36f'
-        'SKIP')
+        'SKIP'
+        '4eea243b9152c38d1e82f0f6abd02fdbb69c9640fd7bef528532ccb0b978a1f0e39d0e2c985a9bd2dd26d2d8242ecb6b5b7f2085f0c62f521e65d487b7d1452d')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # https://gitlab.archlinux.org/archlinux/devtools/-/merge_requests/92
+  patch -Np1 -i ../makepkg.conf-set-LTOFLAGS-flto-auto.patch
+}
+
 build() {
   cd ${pkgname}-${pkgver}
   make BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" PREFIX=/usr

Added: makepkg.conf-set-LTOFLAGS-flto-auto.patch
===================================================================
--- makepkg.conf-set-LTOFLAGS-flto-auto.patch	                        (rev 0)
+++ makepkg.conf-set-LTOFLAGS-flto-auto.patch	2022-03-06 18:09:19 UTC (rev 439199)
@@ -0,0 +1,25 @@
+From 00571896cc776222f14d9f67627ba6fb54512bd7 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 6 Mar 2022 10:59:47 +0200
+Subject: [PATCH] makepkg.conf: set LTOFLAGS="-flto=auto"
+
+For use with pacman 6.0.1-4 which backports support for LTOFLAGS in
+order to speed up builds that use gcc as the compiler. This is less
+useful when clang is used, though a hack would be to specify in the
+PKGBUILD `LTOFLAGS="-flto=thin"` (outside of any function).
+---
+ makepkg-x86_64.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf
+index 19d16f7..7725296 100644
+--- a/makepkg-x86_64.conf
++++ b/makepkg-x86_64.conf
+@@ -45,6 +45,7 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
+         -fstack-clash-protection -fcf-protection"
+ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
+ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
++LTOFLAGS="-flto=auto"
+ #RUSTFLAGS="-C opt-level=2"
+ #-- Make Flags: change this for DistCC/SMP systems
+ #MAKEFLAGS="-j2"