summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD27
2 files changed, 22 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6bdd80c1a742..672eafc6c85c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = distccd-x86_64
pkgdesc = Toolchain for x86_64 builds on Arch ARM volunteers via distcc
pkgver = 9.2.0
- pkgrel = 3
+ pkgrel = 4
url = https://archlinuxarm.org/wiki/Distcc_Cross-Compiling
install = readme.install
arch = armv7h
@@ -14,19 +14,19 @@ pkgbase = distccd-x86_64
options = emptydirs
options = !strip
backup = etc/conf.d/distccd-x86_64
- 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
+ source_armv7h = http://repo-ck.com/PKG_source/x-tools86-armv7h-20191105.tar.zst
+ source_armv7h = http://repo-ck.com/PKG_source/x-tools86-armv7h-20191105.tar.zst.sig
+ sha256sums_armv7h = 90071322f03cabb95a2ea5e4c01fd55f5991acce02014074598097e5c06070d4
+ sha256sums_armv7h = SKIP
+ source_aarch64 = http://repo-ck.com/PKG_source/x-tools86-aarch64-20191105.tar.zst
+ source_aarch64 = http://repo-ck.com/PKG_source/x-tools86-aarch64-20191105.tar.zst.sig
+ sha256sums_aarch64 = 95455060d212b52a805fb3da7ad3319a172c96c6e52583cd6222830220411f34
+ sha256sums_aarch64 = SKIP
pkgname = distccd-x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 45f72f5d243c..e564fe4f1018 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,19 @@
# Maintainer: graysky <graysky AT archlinux DOT us>
-
+
pkgname=distccd-x86_64
arch=(armv7h aarch64)
_date=20191105
# inspect source tarball under $name/share/gcc-x.y.z
pkgver=9.2.0
-pkgrel=3
+pkgrel=4
license=('GPL' )
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-armv7h-$_date.tar.zst"{,.sig}
-"http://repo-ck.com/PKG_source/x-tools86-aarch64-$_date.tar.zst"{,.sig}
-distccd-x86_64.{service,config}
-)
+source_armv7h=("http://repo-ck.com/PKG_source/x-tools86-armv7h-$_date.tar.zst"{,.sig})
+source_aarch64=("http://repo-ck.com/PKG_source/x-tools86-aarch64-$_date.tar.zst"{,.sig})
+source=(distccd-x86_64.{service,config})
noextract=("x-tools86-armv7h-$_date.tar.zst"
"x-tools86-aarch64-$_date.tar.zst")
backup=(etc/conf.d/distccd-x86_64)
@@ -22,12 +21,12 @@ install=readme.install
validpgpkeys=(
'4E22BB637E26407D5DEE550988A032865EE46C4C' # graysky
)
-sha256sums=('90071322f03cabb95a2ea5e4c01fd55f5991acce02014074598097e5c06070d4'
- 'SKIP'
- '95455060d212b52a805fb3da7ad3319a172c96c6e52583cd6222830220411f34'
- 'SKIP'
- '23e791054de2b2599699482fdd880066c9d03758f9e38eb4634dc571cb90959e'
+sha256sums=('23e791054de2b2599699482fdd880066c9d03758f9e38eb4634dc571cb90959e'
'ea406b82e10b7084192d0a480ec24ee889a6a592ea3e339dc81cf3a6f1058bf9')
+sha256sums_armv7h=('90071322f03cabb95a2ea5e4c01fd55f5991acce02014074598097e5c06070d4'
+ 'SKIP')
+sha256sums_aarch64=('95455060d212b52a805fb3da7ad3319a172c96c6e52583cd6222830220411f34'
+ 'SKIP')
package() {
# install symlink to distccd
@@ -39,9 +38,9 @@ package() {
_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"
+ ln -sf /usr/bin/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"
@@ -50,6 +49,6 @@ package() {
# copy in toolchain
install -d "${pkgdir}/opt"
- bsdtar -xf "${srcdir}/x-tools86-$CARCH-$_date.tar.zst" -C "${pkgdir}/opt/"
+ bsdtar -x --uid 0 --gid 0 -f "${srcdir}/x-tools86-$CARCH-$_date.tar.zst" -C "${pkgdir}/opt/"
}