[arch-commits] Commit in distcc/repos/community-x86_64 (8 files)
Alexander Rødseth
arodseth at archlinux.org
Mon May 24 20:45:06 UTC 2021
Date: Monday, May 24, 2021 @ 20:45:05
Author: arodseth
Revision: 944925
archrelease: copy trunk to community-x86_64
Added:
distcc/repos/community-x86_64/PKGBUILD
(from rev 944924, distcc/trunk/PKGBUILD)
distcc/repos/community-x86_64/distccd.conf.d
(from rev 944924, distcc/trunk/distccd.conf.d)
distcc/repos/community-x86_64/distccd.service
(from rev 944924, distcc/trunk/distccd.service)
distcc/repos/community-x86_64/sysusers.conf
(from rev 944924, distcc/trunk/sysusers.conf)
Deleted:
distcc/repos/community-x86_64/PKGBUILD
distcc/repos/community-x86_64/distccd.conf.d
distcc/repos/community-x86_64/distccd.service
distcc/repos/community-x86_64/sysusers.conf
-----------------+
PKGBUILD | 151 +++++++++++++++++++++++++-----------------------------
distccd.conf.d | 18 +++---
distccd.service | 24 ++++----
sysusers.conf | 4 -
4 files changed, 95 insertions(+), 102 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-24 20:44:56 UTC (rev 944924)
+++ PKGBUILD 2021-05-24 20:45:05 UTC (rev 944925)
@@ -1,79 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: John <graysky at archlinux.us>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=distcc
-pkgver=3.3.5
-pkgrel=3
-_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'
-license=(GPL)
-depends=(avahi popt python)
-makedepends=(git gtk3)
-optdepends=("gcc=$_gccver"
- 'gtk3: for distccmon')
-backup=(etc/conf.d/distccd
- etc/distcc/hosts)
-source=("git+$url#commit=8d2a5709d249949e8177dcf08b56dbe7857daa7f" # tag: v3.3.5
- distccd.conf.d
- distccd.service
- sysusers.conf
- gtk3.patch::https://github.com/distcc/distcc/commit/ff0a09f9e335d26265d8955176df1009ce40f518.patch)
-sha256sums=('SKIP'
- '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
- '360493245590d8c1480ff93cd30c9e81cb86efebacd78e45f37e7d6cdbcc2136'
- '4e037a6225f498b51d6902d117be979454ac78ec5fd2f65f1d5a38e10859612a'
- 'fa931b9e0356878469a10c647573d8b20ce45a21d77cffbdd56a36983923bcb5')
-
-prepare() {
- cd $pkgname
- patch -p1 -i "$srcdir/gtk3.patch"
- ./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'
- ./configure \
- --enable-rfc2553 \
- --mandir=/usr/share/man \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-gtk
- make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python
-}
-
-package() {
- make -C $pkgname \
- DESTDIR="$pkgdir" \
- INCLUDESERVER_PYTHON=/usr/bin/python \
- install
-
- install -Dm644 distccd.conf.d "$pkgdir/etc/conf.d/distccd"
- install -Dm644 distccd.service \
- "$pkgdir/usr/lib/systemd/system/distccd.service"
-
- # 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 "${_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
-
- # FS#67629
- install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
-}
Copied: distcc/repos/community-x86_64/PKGBUILD (from rev 944924, distcc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-24 20:45:05 UTC (rev 944925)
@@ -0,0 +1,72 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: John <graysky at archlinux.us>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=distcc
+pkgver=3.4
+pkgrel=1
+_gccver=11.1.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'
+license=(GPL)
+depends=(avahi popt python)
+makedepends=(git gtk3)
+optdepends=("gcc=$_gccver"
+ 'gtk3: for distccmon')
+backup=(etc/conf.d/distccd
+ etc/distcc/hosts)
+source=("git+$url#commit=50d821efe99cae82c05be0a4ab3b4035ef0d3883" # tag: v3.4
+ distccd.conf.d
+ distccd.service
+ sysusers.conf)
+b2sums=('SKIP'
+ 'c48a6daea2cae5e5865c488e612c819e6f9bf4a1b205e2cd264b795de3450d40b0fe05264fbd8a3fe861f03e38d91e7e791ad67e22da5b5d0b43bcb380b8b4c9'
+ '9b6ffc02e9360fd92f7595e96ef2d69b5f6d72acf343009375fa081f86b26f51960b139c4f6e0e3c8befa37eba4894d61351bbfab6386389c262db0cc01a8b8e'
+ 'd1b057ce49994ac61e9d5a861c1c770452102300d47a9c396b3272d7f5afbd3fe3e865e6db11c046e73ae3b6886bc8970a10624650731d55132362436904f989')
+
+prepare() {
+ cd $pkgname
+ ./autogen.sh
+ sed -i 's/ install-gnome-data//g' Makefile.in
+}
+
+build() {
+ cd $pkgname
+ export CFLAGS+=' -fcommon'
+ ./configure \
+ --enable-rfc2553 \
+ --mandir=/usr/share/man \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-gtk
+ make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python
+}
+
+package() {
+ make -C $pkgname \
+ DESTDIR="$pkgdir" \
+ INCLUDESERVER_PYTHON=/usr/bin/python \
+ install
+
+ install -Dm644 distccd.conf.d "$pkgdir/etc/conf.d/distccd"
+ install -Dm644 distccd.service \
+ "$pkgdir/usr/lib/systemd/system/distccd.service"
+
+ # 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 "${_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
+
+ # FS#67629
+ install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/distccd.conf"
+}
Deleted: distccd.conf.d
===================================================================
--- distccd.conf.d 2021-05-24 20:44:56 UTC (rev 944924)
+++ distccd.conf.d 2021-05-24 20:45:05 UTC (rev 944925)
@@ -1,9 +0,0 @@
-#
-# Parameters to be passed to distccd
-#
-# You must explicitly add IPs (or subnets) that are allowed to connect,
-# using the --allow switch. See the distccd manpage for more info.
-#
-
-DISTCC_ARGS="--allow 127.0.0.1"
-#DISTCC_ARGS="--allow 192.168.0.0/24 --log-level error --log-file /tmp/distccd.log"
Copied: distcc/repos/community-x86_64/distccd.conf.d (from rev 944924, distcc/trunk/distccd.conf.d)
===================================================================
--- distccd.conf.d (rev 0)
+++ distccd.conf.d 2021-05-24 20:45:05 UTC (rev 944925)
@@ -0,0 +1,9 @@
+#
+# Parameters to be passed to distccd
+#
+# You must explicitly add IPs (or subnets) that are allowed to connect,
+# using the --allow switch. See the distccd manpage for more info.
+#
+
+DISTCC_ARGS="--allow 127.0.0.1"
+#DISTCC_ARGS="--allow 192.168.0.0/24 --log-level error --log-file /tmp/distccd.log"
Deleted: distccd.service
===================================================================
--- distccd.service 2021-05-24 20:44:56 UTC (rev 944924)
+++ distccd.service 2021-05-24 20:45:05 UTC (rev 944925)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Distributed C, C++ and Objective-C compiler
-Documentation=man:distccd(1)
-After=network.target
-
-[Service]
-User=distcc
-EnvironmentFile=/etc/conf.d/distccd
-ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
-
-[Install]
-WantedBy=multi-user.target
Copied: distcc/repos/community-x86_64/distccd.service (from rev 944924, distcc/trunk/distccd.service)
===================================================================
--- distccd.service (rev 0)
+++ distccd.service 2021-05-24 20:45:05 UTC (rev 944925)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Distributed C, C++ and Objective-C compiler
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=distcc
+EnvironmentFile=/etc/conf.d/distccd
+ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
+
+[Install]
+WantedBy=multi-user.target
Deleted: sysusers.conf
===================================================================
--- sysusers.conf 2021-05-24 20:44:56 UTC (rev 944924)
+++ sysusers.conf 2021-05-24 20:45:05 UTC (rev 944925)
@@ -1,2 +0,0 @@
-g distcc - -
-u distcc - "distcc user" /usr/bin/nologin
Copied: distcc/repos/community-x86_64/sysusers.conf (from rev 944924, distcc/trunk/sysusers.conf)
===================================================================
--- sysusers.conf (rev 0)
+++ sysusers.conf 2021-05-24 20:45:05 UTC (rev 944925)
@@ -0,0 +1,2 @@
+g distcc - -
+u distcc - "distcc user" /usr/bin/nologin
More information about the arch-commits
mailing list