summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2019-11-10 07:28:56 -0500
committergraysky2019-11-10 07:28:56 -0500
commita42be3800ad3d866db000b7cc263ea589178830f (patch)
tree451d90015db9ba496372f682889182fe503faf4c
parentfe3f686fd595466fccb49cc86f1ff0381ca5af8b (diff)
downloadaur-a42be3800ad3d866db000b7cc263ea589178830f.tar.gz
Update to 9.2.0-3
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD37
2 files changed, 33 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f4158793a6..6bdd80c1a74 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,30 @@
pkgbase = distccd-x86_64
- pkgdesc = Toolchain for x86_64 builds via distcc on Arch ARM armv7h volunteers
+ pkgdesc = Toolchain for x86_64 builds on Arch ARM volunteers via distcc
pkgver = 9.2.0
- pkgrel = 2
+ pkgrel = 3
url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling
install = readme.install
arch = armv7h
+ arch = aarch64
license = GPL
depends = distcc
- noextract = x-tools86-20191105.tar.zst
+ noextract = x-tools86-armv7h-20191105.tar.zst
+ noextract = x-tools86-aarch64-20191105.tar.zst
options = libtool
options = emptydirs
options = !strip
backup = etc/conf.d/distccd-x86_64
- source = http://repo-ck.com/PKG_source/x-tools86-20191105.tar.zst
- source = http://repo-ck.com/PKG_source/x-tools86-20191105.tar.zst.sig
+ source = http://repo-ck.com/PKG_source/x-tools86-armv7h-20191105.tar.zst
+ source = http://repo-ck.com/PKG_source/x-tools86-armv7h-20191105.tar.zst.sig
+ source = http://repo-ck.com/PKG_source/x-tools86-aarch64-20191105.tar.zst
+ source = http://repo-ck.com/PKG_source/x-tools86-aarch64-20191105.tar.zst.sig
source = distccd-x86_64.service
source = distccd-x86_64.config
validpgpkeys = 4E22BB637E26407D5DEE550988A032865EE46C4C
sha256sums = 90071322f03cabb95a2ea5e4c01fd55f5991acce02014074598097e5c06070d4
sha256sums = SKIP
+ sha256sums = 95455060d212b52a805fb3da7ad3319a172c96c6e52583cd6222830220411f34
+ sha256sums = SKIP
sha256sums = 23e791054de2b2599699482fdd880066c9d03758f9e38eb4634dc571cb90959e
sha256sums = ea406b82e10b7084192d0a480ec24ee889a6a592ea3e339dc81cf3a6f1058bf9
diff --git a/PKGBUILD b/PKGBUILD
index d53e677b679..45f72f5d243 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,31 @@
# Maintainer: graysky <graysky AT archlinux DOT us>
-
-pkgname=(distccd-x86_64)
+
+pkgname=distccd-x86_64
+arch=(armv7h aarch64)
_date=20191105
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=9.2.0
-pkgrel=2
-arch=('armv7h')
+pkgrel=3
license=('GPL' )
-pkgdesc="Toolchain for x86_64 builds via distcc on Arch ARM armv7h volunteers"
url="https://archlinuxarm.org/wiki/Distcc_Cross-Compiling"
+pkgdesc="Toolchain for x86_64 builds on Arch ARM volunteers via distcc"
depends=('distcc')
options=('libtool' 'emptydirs' '!strip')
-source=("http://repo-ck.com/PKG_source/x-tools86-$_date.tar.zst"{,.sig}
+source=("http://repo-ck.com/PKG_source/x-tools86-armv7h-$_date.tar.zst"{,.sig}
+"http://repo-ck.com/PKG_source/x-tools86-aarch64-$_date.tar.zst"{,.sig}
distccd-x86_64.{service,config}
)
-install=readme.install
-noextract=("x-tools86-$_date.tar.zst")
+noextract=("x-tools86-armv7h-$_date.tar.zst"
+"x-tools86-aarch64-$_date.tar.zst")
backup=(etc/conf.d/distccd-x86_64)
+install=readme.install
validpgpkeys=(
'4E22BB637E26407D5DEE550988A032865EE46C4C' # graysky
)
sha256sums=('90071322f03cabb95a2ea5e4c01fd55f5991acce02014074598097e5c06070d4'
'SKIP'
+ '95455060d212b52a805fb3da7ad3319a172c96c6e52583cd6222830220411f34'
+ 'SKIP'
'23e791054de2b2599699482fdd880066c9d03758f9e38eb4634dc571cb90959e'
'ea406b82e10b7084192d0a480ec24ee889a6a592ea3e339dc81cf3a6f1058bf9')
@@ -32,17 +36,20 @@ package() {
# 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/x86_64-pc-linux-gnu-$bin"
- done
-
- # copy in toolchain
- install -d "${pkgdir}/opt"
- bsdtar -xf "${srcdir}/x-tools86-$_date.tar.zst" -C "${pkgdir}/opt/"
+ _targets=(c++ cc clang clang++ cpp g++ gcc)
+ for bin in "${_targets[@]}"; do
+ ln -sf ../../distcc "${pkgdir}/usr/lib/distcc/x86_64-pc-linux-gnu-$bin"
+ done
+
# install service and config
install -Dm644 "${srcdir}/distccd-x86_64.service" \
"${pkgdir}/usr/lib/systemd/system/distccd-x86_64.service"
install -Dm644 "${srcdir}/distccd-x86_64.config" \
"${pkgdir}/etc/conf.d/distccd-x86_64"
+
+ # copy in toolchain
+ install -d "${pkgdir}/opt"
+ bsdtar -xf "${srcdir}/x-tools86-$CARCH-$_date.tar.zst" -C "${pkgdir}/opt/"
}
+