[arch-commits] Commit in distcc/repos/community-x86_64 (6 files)

Alexander Rødseth arodseth at archlinux.org
Tue Apr 28 22:37:24 UTC 2020


    Date: Tuesday, April 28, 2020 @ 22:37:24
  Author: arodseth
Revision: 622144

archrelease: copy trunk to community-x86_64

Added:
  distcc/repos/community-x86_64/PKGBUILD
    (from rev 622143, distcc/trunk/PKGBUILD)
  distcc/repos/community-x86_64/distccd.conf.d
    (from rev 622143, distcc/trunk/distccd.conf.d)
  distcc/repos/community-x86_64/distccd.service
    (from rev 622143, distcc/trunk/distccd.service)
Deleted:
  distcc/repos/community-x86_64/PKGBUILD
  distcc/repos/community-x86_64/distccd.conf.d
  distcc/repos/community-x86_64/distccd.service

-----------------+
 PKGBUILD        |  155 +++++++++++++++++++++++++++---------------------------
 distccd.conf.d  |   18 +++---
 distccd.service |   24 ++++----
 3 files changed, 100 insertions(+), 97 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-28 22:37:14 UTC (rev 622143)
+++ PKGBUILD	2020-04-28 22:37:24 UTC (rev 622144)
@@ -1,76 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# 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=4
-pkgdesc='Distributed compilation service for C, C++ and Objective-C'
-arch=(x86_64)
-url='http://distcc.org'
-license=(GPL)
-depends=(avahi popt python)
-makedepends=(git gtk2 setconf)
-optdepends=('gtk2: for distccmon-gnome')
-backup=('etc/conf.d/distccd'
-        'etc/distcc/hosts')
-source=("git+https://github.com/distcc/distcc#tag=v$pkgver"
-        'distccd.conf.d'
-        'distccd.service')
-sha256sums=('SKIP'
-            '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
-            '6d46844f0bebd56541e1a233f9f02a51cc17885120e832bfb37711217403d32f')
-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"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-rfc2553 \
-    --mandir=/usr/share/man \
-    --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
-
-  # 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
-  _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 "${_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
-# vim: ts=2 sw=2 et:

Copied: distcc/repos/community-x86_64/PKGBUILD (from rev 622143, distcc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-04-28 22:37:24 UTC (rev 622144)
@@ -0,0 +1,79 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# 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=5
+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 gtk2 setconf)
+optdepends=('gtk2: for distccmon-gnome')
+backup=('etc/conf.d/distccd'
+        'etc/distcc/hosts')
+source=("git+$url#commit=4cde9bcfbda589abd842e3bbc652ce369085eaae" # tag: v3.3.3
+        'distccd.conf.d'
+        'distccd.service')
+sha256sums=('SKIP'
+            '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
+            '6d46844f0bebd56541e1a233f9f02a51cc17885120e832bfb37711217403d32f')
+prepare() {
+  cd "$pkgname"
+
+  ./autogen.sh
+  setconf gnome/distccmon-gnome.desktop Name 'DistCC Monitor'
+  sed -i 's/ install-gnome-data//g' Makefile.in
+
+  # FS#66418, support Python 3.9
+  find . -name "*.py" -type f -exec sed -i 's/time.clock()/time.perf_counter()/g' {} \;
+}
+
+build() {
+  cd "$pkgname"
+
+  ./configure \
+    --prefix=/usr \
+    --enable-rfc2553 \
+    --mandir=/usr/share/man \
+    --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
+
+  # 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
+  _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 "${_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
+# vim: ts=2 sw=2 et:

Deleted: distccd.conf.d
===================================================================
--- distccd.conf.d	2020-04-28 22:37:14 UTC (rev 622143)
+++ distccd.conf.d	2020-04-28 22:37:24 UTC (rev 622144)
@@ -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 622143, distcc/trunk/distccd.conf.d)
===================================================================
--- distccd.conf.d	                        (rev 0)
+++ distccd.conf.d	2020-04-28 22:37:24 UTC (rev 622144)
@@ -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	2020-04-28 22:37:14 UTC (rev 622143)
+++ distccd.service	2020-04-28 22:37:24 UTC (rev 622144)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Distributed compilation server for C, C++ and Objective-C
-Documentation=man:distccd(1)
-After=network.target
-
-[Service]
-User=nobody
-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 622143, distcc/trunk/distccd.service)
===================================================================
--- distccd.service	                        (rev 0)
+++ distccd.service	2020-04-28 22:37:24 UTC (rev 622144)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Distributed compilation server for C, C++ and Objective-C
+Documentation=man:distccd(1)
+After=network.target
+
+[Service]
+User=nobody
+EnvironmentFile=/etc/conf.d/distccd
+ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
+
+[Install]
+WantedBy=multi-user.target



More information about the arch-commits mailing list