summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2018-03-26 18:26:26 -0400
committergraysky2018-03-26 18:26:26 -0400
commit571ea196bbd19dc8ad5e49c3b53da0d34b62c4c6 (patch)
treec52e62b4ad9fc7c85414ad344ddc38aa35f104cb
parent5c4d19b44be985f7819d01c710a45ea38e781048 (diff)
downloadaur-571ea196bbd19dc8ad5e49c3b53da0d34b62c4c6.tar.gz
Update to 7.2.1-6
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD15
2 files changed, 18 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d187aad0490..f1a90f39e12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Mar 25 18:36:24 UTC 2018
+# Mon Mar 26 22:26:26 UTC 2018
pkgbase = distccd-alarm
pkgdesc = Toolchain for Arch ARM builds via distcc on x86_64 slaves
pkgver = 7.2.1
- pkgrel = 5
+ pkgrel = 6
url = https://archlinuxarm.org/wiki/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.2.1-5-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools.tar.xz
- source = x-tools6h-7.2.1-5-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools6h.tar.xz
- source = x-tools7h-7.2.1-5-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools7h.tar.xz
- source = x-tools8-7.2.1-5-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools8.tar.xz
+ source = x-tools-7.2.1-6-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools.tar.xz
+ source = x-tools6h-7.2.1-6-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools6h.tar.xz
+ source = x-tools7h-7.2.1-6-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools7h.tar.xz
+ source = x-tools8-7.2.1-6-20180125.tar.xz::https://archlinuxarm.org/builder/xtools/x-tools8.tar.xz
source = config.in
source = service.in
source = readme.in
diff --git a/PKGBUILD b/PKGBUILD
index 04bdae84e38..a9feb89cc3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
# Contributor: Jason Plum <jplum@archlinuxarm.org>
# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
+#PKGEXT='.pkg.tar'
_subarchs=(armv5 armv6h armv7h armv8)
pkgbase='distccd-alarm'
pkgname=("${_subarchs[@]/#/$pkgbase-}")
_date=20180125
pkgver=7.2.1
-pkgrel=5
+pkgrel=6
arch=('x86_64')
license=('GPL' )
pkgdesc="Toolchain for Arch ARM builds via distcc on x86_64 slaves"
@@ -35,7 +36,7 @@ build() {
_path=('' '6h' '7h' '8')
_name=('arm-unknown-linux-gnueabi' 'arm-unknown-linux-gnueabihf'
'arm-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnueabi')
- _port=('3633' '3643' '3635' '3636')
+ _port=('3633' '3634' '3635' '3636')
for i in 0 1 2 3; do
# make service units
@@ -64,6 +65,11 @@ _package_subarch() {
# install symlink to distccd
install -d "${pkgdir}/usr/bin"
ln -sf /usr/bin/distccd "${pkgdir}/usr/bin/distccd-$1"
+ # install whitelist for toolchain new for v3.3
+ install -d "${pkgdir}/usr/lib/distcc"
+ for bin in c++ cc cpp g++ gcc; do
+ ln -sf /usr/bin/distcc "${pkgdir}/usr/lib/distcc/$3-$bin"
+ done
# copy in toolchain
install -d "${pkgdir}/opt"
cp -a "${srcdir}/$2" "${pkgdir}/opt"
@@ -76,9 +82,12 @@ _package_subarch() {
}
for i in "${!_subarchs[@]}"; do
+ _bins=('arm-unknown-linux-gnueabi' 'armv6l-unknown-linux-gnueabihf'
+ 'armv7l-unknown-linux-gnueabihf' 'aarch64-unknown-linux-gnu')
_xtoolsdir="${source[i]##*/}"
_xtoolsdir="${_xtoolsdir%%.*}"
eval 'package_distccd-alarm-'${_subarchs[i]}'() {
- _package_subarch '${_subarchs[i]}' '${_xtoolsdir}'
+# _package_subarch '${_subarchs[i]}' '${_xtoolsdir}' '${_whitelist[i]}'
+ _package_subarch '${_subarchs[i]}' '${_xtoolsdir}' '${_bins[i]}'
}'
done