From 640bb1cf9add60db554fe1c26db79b5571ca2ef1 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 4 Jan 2020 15:09:03 +0000 Subject: [PATCH] community/distcc to 3.3.3-4 --- community/distcc/PKGBUILD | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/community/distcc/PKGBUILD b/community/distcc/PKGBUILD index 3ac0642d7..8e80b5422 100644 --- a/community/distcc/PKGBUILD +++ b/community/distcc/PKGBUILD @@ -2,6 +2,7 @@ # Contributor: Sergej Pupykin # Contributor: Judd Vinet # Contributor: Giovanni Scafora +# Contributor: John # ALARM: Kevin Mihelich # - added --without-avahi to configure @@ -10,13 +11,13 @@ pkgname=distcc pkgver=3.3.3 -pkgrel=2 +pkgrel=4 pkgdesc='Distributed compilation service for C, C++ and Objective-C' arch=(x86_64) url='http://distcc.org' license=(GPL) depends=(popt) -makedepends=(git python setconf) +makedepends=(git python) optdepends=(python) backup=('etc/conf.d/distccd' 'etc/distcc/hosts') @@ -71,10 +72,12 @@ package() { # Symlinks 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" + _targets=(c++ c89 c99 cc clang clang++ cpp g++ gcc) + 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 }