summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2019-11-03 11:12:05 -0500
committergraysky2019-11-03 11:12:05 -0500
commit96277204ca9df81269b5e4956635aa791d4564a7 (patch)
tree62a6350f510651a24e069128841c22b0ac1f7f3b
parenta052803b47959bbd7bbd518d5a323c76ceb21662 (diff)
downloadaur-96277204ca9df81269b5e4956635aa791d4564a7.tar.gz
Update to 8.3.0-2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
2 files changed, 20 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f70bbb99163..12f88b832f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,15 @@
pkgbase = distccd-alarm
pkgdesc = Toolchain for Arch ARM builds via distcc on x86_64 volunteers
pkgver = 8.3.0
- pkgrel = 1
+ pkgrel = 2
url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling
arch = x86_64
license = GPL
depends = distcc
+ noextract = x-tools-20190909.tar.xz
+ noextract = x-tools6h-20190909.tar.xz
+ noextract = x-tools7h-20190909.tar.xz
+ noextract = x-tools8-20190909.tar.xz
options = libtool
options = emptydirs
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 5d022114291..0dbdad21680 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Jason Plum <jplum@archlinuxarm.org>
# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
-_subarchs=(armv5 armv6h armv7h armv8)
-_pkgrel_upstream=1
pkgbase='distccd-alarm'
+_subarchs=(armv5 armv6h armv7h armv8)
pkgname=("${_subarchs[@]/#/$pkgbase-}")
_date=20190909
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=8.3.0
-pkgrel=1
+_pkgrel_upstream=1
+pkgrel=2
arch=('x86_64')
license=('GPL' )
pkgdesc="Toolchain for Arch ARM builds via distcc on x86_64 volunteers"
@@ -25,6 +25,12 @@ source=(
"x-tools8-$_date.tar.xz::$_URL/x-tools8.tar.xz"
'config.in' 'service.in' 'readme.in'
)
+noextract=(
+"x-tools-$_date.tar.xz"
+"x-tools6h-$_date.tar.xz"
+"x-tools7h-$_date.tar.xz"
+"x-tools8-$_date.tar.xz"
+)
#PKGEXT='.pkg.tar'
md5sums=('8b93708e0f7ef971b01b71dfedaffe40'
'8b8c261c91f11545f4b54b0bddaf1db1'
@@ -68,18 +74,21 @@ _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"
- # install services
+ #cp -a "${srcdir}/$2" "${pkgdir}/opt"
+ bsdtar -xpf "${srcdir}/$2-$_date.tar.xz" -C "${pkgdir}/opt/"
+
+ # install services and configs
install -Dm644 "${srcdir}/distccd-$1.service" \
"${pkgdir}/usr/lib/systemd/system/distccd-$1.service"
- # install config
install -Dm644 "${srcdir}/distccd-$1.conf" \
"${pkgdir}/etc/conf.d/distccd-$1"
}