summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD72
1 files changed, 37 insertions, 35 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 03e4227b6c78..4bdc657972cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,34 @@
-# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org>
+# Maintainer: John <graysky@archlinux.us>
+# Contributor: Alexander F. Rødseth <xyproto@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=distcc-git
_pkgname=distcc
-pkgver=v3.2rc1.r225.g6fb446f
+pkgver=v3.4.r40.g2d33649
pkgrel=1
-pkgdesc='Distributed C, C++ and Objective-C compiler, git version'
-arch=('x86_64')
-url='http://distcc.org'
-license=('GPL')
-depends=('avahi' 'popt')
-makedepends=('git' 'gtk2' 'python' 'setconf')
-optdepends=('gtk2: for distccmon-gnome' 'python')
+_gccver=13.1.1 # 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'
+license=(GPL)
+depends=(avahi popt python)
+makedepends=(git gtk3)
+optdepends=("gcc=$_gccver"
+ 'gtk3: for distccmon')
conflicts=(distcc)
provides=(distcc)
-backup=('etc/conf.d/distccd'
- 'etc/distcc/hosts')
-source=("git://github.com/distcc/distcc.git"
- 'distccd.conf.d'
- 'distccd.service')
-sha256sums=('SKIP'
- '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
- '0f18ffb58647eeba643f28e9029a5d307100df3470eb228097f2b3f4196d8098')
+backup=(etc/conf.d/distccd
+ etc/distcc/hosts)
+source=(git+https://github.com/distcc/distcc
+ distccd.conf.d
+ distccd.service
+ sysusers.conf)
+b2sums=('SKIP'
+ 'c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9'
+ '9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e'
+ 'd1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989')
pkgver() {
cd "$_pkgname"
git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
@@ -31,23 +36,23 @@ pkgver() {
prepare() {
cd "$_pkgname"
-
./autogen.sh
- setconf gnome/distccmon-gnome.desktop Name 'DistCC Monitor'
sed -i 's/ install-gnome-data//g' Makefile.in
}
build() {
cd "$_pkgname"
+ # ref: https://github.com/distcc/distcc/issues/454#issuecomment-1087865811
+ export CFLAGS+=' -DPY_SSIZE_T_CLEAN -fcommon'
+
./configure \
- --prefix=/usr \
--enable-rfc2553 \
--mandir=/usr/share/man \
+ --prefix=/usr \
--sbindir=/usr/bin \
--sysconfdir=/etc \
--with-gtk
-
make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python
}
@@ -57,25 +62,22 @@ package() {
INCLUDESERVER_PYTHON=/usr/bin/python \
install
- # Configuration
install -Dm644 distccd.conf.d "$pkgdir/etc/conf.d/distccd"
install -Dm644 distccd.service \
"$pkgdir/usr/lib/systemd/system/distccd.service"
- # Desktop shortcut
- install -Dm644 "$_pkgname/gnome/distccmon-gnome-icon.png" \
- "$pkgdir/usr/share/pixmaps/distccmon-gnome-icon.png"
- install -Dm644 "$_pkgname/gnome/distccmon-gnome.desktop" \
- "$pkgdir/usr/share/applications/distccmon-gnome.desktop"
-
- # Symlinks
+ # Package 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-$_gccver)
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
-}
-# getver: distcc.org
+ # FS#67629
+ install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
+}
# vim: ts=2 sw=2 et: