diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 24 |
2 files changed, 16 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = distcc-git pkgdesc = Distributed compilation service for C, C++ and Objective-C - pkgver = v3.4.r0.g50d821e + pkgver = v3.4.r40.g2d33649 pkgrel = 1 url = https://github.com/distcc/distcc arch = x86_64 @@ -10,12 +10,13 @@ pkgbase = distcc-git depends = avahi depends = popt depends = python - optdepends = gcc=11.1.0 + optdepends = gcc=13.1.1 + optdepends = gtk3: for distccmon provides = distcc conflicts = distcc backup = etc/conf.d/distccd backup = etc/distcc/hosts - source = git://github.com/distcc/distcc.git + source = git+https://github.com/distcc/distcc source = distccd.conf.d source = distccd.service source = sysusers.conf @@ -25,4 +26,3 @@ pkgbase = distcc-git b2sums = d1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989 pkgname = distcc-git - @@ -6,21 +6,22 @@ pkgname=distcc-git _pkgname=distcc -pkgver=v3.4.r0.g50d821e +pkgver=v3.4.r40.g2d33649 pkgrel=1 -_gccver=11.1.0 # Current GCC version, used for symlinks. See FS#69044 +_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") +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 +source=(git+https://github.com/distcc/distcc distccd.conf.d distccd.service sysusers.conf) @@ -37,15 +38,14 @@ prepare() { 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,e.clock(,e.perf_counter(,g' {} \; - # Remove debug print, ref. https://github.com/distcc/distcc/commit/2df787cc0c02743254d5e6c04a38da82f1e3d9f6 - sed -i '/fisk state/d' src/mon-gnome.c } build() { cd "$_pkgname" - export CFLAGS+=' -fcommon' + + # ref: https://github.com/distcc/distcc/issues/454#issuecomment-1087865811 + export CFLAGS+=' -DPY_SSIZE_T_CLEAN -fcommon' + ./configure \ --enable-rfc2553 \ --mandir=/usr/share/man \ @@ -69,12 +69,12 @@ package() { # 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" + 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 |