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

[Alexander Rødseth]

    Date: Saturday, January 4, 2020 @ 12:47:04
  Author: arodseth
Revision: 547890

upgpkg: distcc 3.3.3-3

Modified:
  distcc/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-04 12:39:34 UTC (rev 547889)
+++ PKGBUILD	2020-01-04 12:47:04 UTC (rev 547890)
@@ -2,10 +2,11 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: John <graysky at archlinux.us>
 
 pkgname=distcc
 pkgver=3.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Distributed compilation service for C, C++ and Objective-C'
 arch=(x86_64)
 url='http://distcc.org'
@@ -60,11 +61,14 @@
     "$pkgdir/usr/share/applications/distccmon-gnome.desktop"
 
   # Symlinks
+  _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc x86_64-pc-linux-gnu-g++
+            x86_64-pc-linux-gnu-gcc x86_64-pc-linux-gnu-gcc-9.2.0)
   install -d "$pkgdir/usr/lib/$pkgname/bin"
-  for bin in c++ cc cpp g++ gcc; do
-    ln -sf "/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
-    # Additional symlinks are needed, see FS#57978
-    ln -sf "/usr/bin/$pkgname" "$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"
+    # Needed for makepkg to work
+    ln -sf "../../../bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
   done
 }