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

[Alexander Rødseth]

    Date: Tuesday, December 22, 2020 @ 17:18:12
  Author: arodseth
Revision: 782679

upgpkg: distcc 3.3.3-9

Modified:
  distcc/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-22 17:18:10 UTC (rev 782678)
+++ PKGBUILD	2020-12-22 17:18:12 UTC (rev 782679)
@@ -6,7 +6,8 @@
 
 pkgname=distcc
 pkgver=3.3.3
-pkgrel=8
+pkgrel=9
+_gccver=10.2.0 # Current GCC version, used for symlinks. See FS#69044
 pkgdesc='Distributed compilation service for C, C++ and Objective-C'
 arch=(x86_64)
 url='https://github.com/distcc/distcc'
@@ -13,6 +14,7 @@
 license=(GPL)
 depends=(avahi popt python)
 makedepends=(git)
+optdepends=("gcc=$_gccver")
 backup=(etc/conf.d/distccd
         etc/distcc/hosts)
 source=("git+$url#commit=4cde9bcfbda589abd842e3bbc652ce369085eaae" # tag: v3.3.3
@@ -25,11 +27,11 @@
             '4e037a6225f498b51d6902d117be979454ac78ec5fd2f65f1d5a38e10859612a')
 
 prepare() {
-  cd "$pkgname"
+  cd $pkgname
   ./autogen.sh
   sed -i 's/ install-gnome-data//g' Makefile.in
   # FS#66418, support Python 3.9
-  find . -name "*.py" -type f -exec sed -i 's/time.clock()/time.perf_counter()/g' {} \;
+  find . -name "*.py" -type f -exec sed -i 's/e.clock(/e.perf_counter(/g' {} \;
 }
 
 build() {
@@ -46,7 +48,7 @@
 }
 
 package() {
-  make -C "$pkgname" \
+  make -C $pkgname \
     DESTDIR="$pkgdir" \
     INCLUDESERVER_PYTHON=/usr/bin/python \
     install
@@ -56,13 +58,13 @@
     "$pkgdir/usr/lib/systemd/system/distccd.service"
   # Symlinks
   _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc $CARCH-pc-linux-gnu-g++
-            $CARCH-pc-linux-gnu-gcc $CARCH-pc-linux-gnu-gcc-9.2.0)
+            $CARCH-pc-linux-gnu-gcc $CARCH-pc-linux-gnu-gcc-$_gccver)
   install -d "$pkgdir/usr/lib/$pkgname/bin"
   for bin in "${_targets[@]}"; do
     # For whitelist since version 3.3, see FS#57978
-    ln -sf "../../bin/$pkgname" "$pkgdir/usr/lib/$pkgname/$bin"
+    ln -sf ../../bin/$pkgname "$pkgdir/usr/lib/$pkgname/$bin"
     # Needed for makepkg to work
-    ln -sf "../../../bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
+    ln -sf ../../../bin/$pkgname "$pkgdir/usr/lib/$pkgname/bin/$bin"
   done
   # FS#67629
   install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"