summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2017-09-14 18:45:42 -0400
committergraysky2017-09-14 18:45:42 -0400
commita1b02bef4627056ee97fc8cb26bbed77f34c5cae (patch)
treebadb39588dbeb54f8384e5339c99e77bfed87330
parent06a9ffa591bb4baa47dce96faf702d167856cc30 (diff)
downloadaur-a1b02bef4627056ee97fc8cb26bbed77f34c5cae.tar.gz
remove ports for different subarchs
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD4
-rw-r--r--config.in2
3 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 49e8162c1ac..0f6cbe64ecf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Sep 14 21:52:55 UTC 2017
+# Thu Sep 14 22:45:38 UTC 2017
pkgbase = distccd-alarm
pkgdesc = A toolchain for Arch ARM builds via distcc on x86_64 slaves
pkgver = 7.1.1
- pkgrel = 1
+ pkgrel = 2
url = http://archlinuxarm.org/developers/distcc-cross-compiling
arch = x86_64
license = GPL
@@ -11,10 +11,10 @@ pkgbase = distccd-alarm
options = libtool
options = emptydirs
options = !strip
- source = x-tools-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-1/x-tools.tar.xz
- source = x-tools6h-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-1/x-tools6h.tar.xz
- source = x-tools7h-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-1/x-tools7h.tar.xz
- source = x-tools8-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-1/x-tools8.tar.xz
+ source = x-tools-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-2/x-tools.tar.xz
+ source = x-tools6h-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-2/x-tools6h.tar.xz
+ source = x-tools7h-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-2/x-tools7h.tar.xz
+ source = x-tools8-7.1.1-2.tar.xz::https://archlinuxarm.org/builder/xtools/7.1.1-2/x-tools8.tar.xz
source = config.in
source = service.in
md5sums = 1ade1ced844961a39e1e539fb04c1d65
diff --git a/PKGBUILD b/PKGBUILD
index 4d4278a7a3b..7032a01921a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _subarchs=(armv5 armv6h armv7h armv8)
pkgbase='distccd-alarm'
pkgname=("${_subarchs[@]/#/$pkgbase-}")
pkgver=7.1.1
-pkgrel=1
+pkgrel=2
arch=('x86_64')
license=('GPL' )
pkgdesc="A toolchain for Arch ARM builds via distcc on x86_64 slaves"
@@ -32,7 +32,6 @@ build() {
_path=('' '6h' '7h' '8')
_name=('arm-unknown-linux-gnueabi' 'arm-unknown-linux-gnueabihf'
'arm-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnueabi')
- _port=(2 3 4 5)
for i in 0 1 2 3; do
# make service units
@@ -42,7 +41,6 @@ build() {
sed -e "s/@VERS@/${_path[$i]}/" \
-e "s/@PATH@/${_name[$i]}/" \
-e "s/@LOG@/${_subarchs[$i]}/" \
- -e "s/@PORT@/${_port[$i]}/" \
<config.in >"distccd-${_subarchs[$i]}.conf"
done
}
diff --git a/config.in b/config.in
index 5a1ea4bd8e7..f443dd86025 100644
--- a/config.in
+++ b/config.in
@@ -6,4 +6,4 @@
#
PATH=/opt/x-tools@VERS@/@PATH@/bin:$PATH
-DISTCC_ARGS="--allow 127.0.0.1 --log-file /tmp/distccd-@LOG@.log --port 363@PORT@"
+DISTCC_ARGS="--allow 127.0.0.1 --log-file /tmp/distccd-@LOG@.log"