[arch-commits] Commit in conky/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Sunday, April 24, 2022 @ 10:36:53
  Author: arojas
Revision: 443883

-ffat-lto-objects, unbundle catch2 to fix build with glibc 2.35

Modified:
  conky/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-24 10:27:20 UTC (rev 443882)
+++ PKGBUILD	2022-04-24 10:36:53 UTC (rev 443883)
@@ -7,12 +7,12 @@
 pkgname=conky
 pkgver=1.12.2
 _gitcommit=52e5aa53b4c76973519a770949dc8bdca0145325
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight system monitor for X'
 url='https://github.com/brndnmtthws/conky'
 license=('BSD' 'GPL')
 arch=('x86_64')
-makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
+makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git' 'catch2')
 depends=(
   'glibc' 'glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft' 'imlib2'
   'libxml2' 'libpulse' 'libxnvctrl' 'systemd-libs' 'ncurses' 'curl'
@@ -29,11 +29,19 @@
   git describe --tags --match 'v*' | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
+prepare() {
+  cd $pkgname
+# Unbundle catch2 to fix build with glibc 2.35
+  rm -r tests/catch2
+  ln -s /usr/include/catch2 tests
+}
+
 build() {
   cd ${pkgname}
   cmake \
     -B build \
     -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
     -D MAINTAINER_MODE=ON \
     -D BUILD_DOCS=ON \
     -D BUILD_WLAN=ON \