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

Alexander Rødseth arodseth at archlinux.org
Fri Mar 26 20:19:13 UTC 2021


    Date: Friday, March 26, 2021 @ 20:19:13
  Author: arodseth
Revision: 904726

archrelease: copy trunk to community-x86_64

Added:
  distcc/repos/community-x86_64/PKGBUILD
    (from rev 904725, distcc/trunk/PKGBUILD)
  distcc/repos/community-x86_64/distccd.conf.d
    (from rev 904725, distcc/trunk/distccd.conf.d)
  distcc/repos/community-x86_64/distccd.service
    (from rev 904725, distcc/trunk/distccd.service)
  distcc/repos/community-x86_64/sysusers.conf
    (from rev 904725, 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        |  156 +++++++++++++++++++++++++++---------------------------
 distccd.conf.d  |   18 +++---
 distccd.service |   24 ++++----
 sysusers.conf   |    4 -
 4 files changed, 102 insertions(+), 100 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-26 20:19:05 UTC (rev 904725)
+++ PKGBUILD	2021-03-26 20:19:13 UTC (rev 904726)
@@ -1,77 +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=2
-_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' {} \;
-}
-
-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 904725, distcc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-26 20:19:13 UTC (rev 904726)
@@ -0,0 +1,79 @@
+# 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"
+}

Deleted: distccd.conf.d
===================================================================
--- distccd.conf.d	2021-03-26 20:19:05 UTC (rev 904725)
+++ distccd.conf.d	2021-03-26 20:19:13 UTC (rev 904726)
@@ -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 904725, distcc/trunk/distccd.conf.d)
===================================================================
--- distccd.conf.d	                        (rev 0)
+++ distccd.conf.d	2021-03-26 20:19:13 UTC (rev 904726)
@@ -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-03-26 20:19:05 UTC (rev 904725)
+++ distccd.service	2021-03-26 20:19:13 UTC (rev 904726)
@@ -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 904725, distcc/trunk/distccd.service)
===================================================================
--- distccd.service	                        (rev 0)
+++ distccd.service	2021-03-26 20:19:13 UTC (rev 904726)
@@ -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-03-26 20:19:05 UTC (rev 904725)
+++ sysusers.conf	2021-03-26 20:19:13 UTC (rev 904726)
@@ -1,2 +0,0 @@
-g distcc - -
-u distcc - "distcc user" /usr/bin/nologin

Copied: distcc/repos/community-x86_64/sysusers.conf (from rev 904725, distcc/trunk/sysusers.conf)
===================================================================
--- sysusers.conf	                        (rev 0)
+++ sysusers.conf	2021-03-26 20:19:13 UTC (rev 904726)
@@ -0,0 +1,2 @@
+g distcc - -
+u distcc - "distcc user" /usr/bin/nologin



More information about the arch-commits mailing list