summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2019-11-11 04:06:32 -0500
committergraysky2019-11-11 04:06:32 -0500
commit305700fc6dcbbbed9692cedee5a23c9ffc7b87a6 (patch)
tree57dd5d0918b6b32c66c5b89c23f993fc27008718
parent338d7dac99926c526a32eedfd82a7e5bb9ce893b (diff)
downloadaur-305700fc6dcbbbed9692cedee5a23c9ffc7b87a6.tar.gz
Update to 8.3.0-4
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
2 files changed, 23 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c51bac5f2d4..551124ef26f 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 = 3
+ pkgrel = 4
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 176fd66c21e..c5d6e4cd9e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,22 @@
# 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=3
+pkgrel=4
+_pkgrel_upstream=1
+#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel"
+_URL="https://archlinuxarm.org/builder/xtools"
arch=('x86_64')
license=('GPL' )
pkgdesc="Toolchain for Arch ARM builds via distcc on x86_64 volunteers"
url="https://archlinuxarm.org/wiki/Distcc_Cross-Compiling"
depends=('distcc')
options=('libtool' 'emptydirs' '!strip')
-#_URL="https://archlinuxarm.org/builder/xtools/$pkgver-$pkgrel"
-_URL="https://archlinuxarm.org/builder/xtools"
source=(
"x-tools-$_date.tar.xz::$_URL/x-tools.tar.xz"
"x-tools6h-$_date.tar.xz::$_URL/x-tools6h.tar.xz"
@@ -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,17 +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
+ for bin in c++ cc clang clang++ cpp g++ gcc; do
ln -sf /usr/bin/distcc "${pkgdir}/usr/lib/distcc/$3-$bin"
done
- # copy in toolchain
+
+ # install toolchain
install -d "${pkgdir}/opt"
- cp -a "${srcdir}/$2" "${pkgdir}/opt"
+ bsdtar -x --uid 0 --gid 0 -f "${srcdir}/$2-$_date.tar.xz" -C "${pkgdir}/opt"
+
# install services
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"