From a64d4fea8afd532546921f5c2ec4bb361d01123c Mon Sep 17 00:00:00 2001
From: Shiz <hi@shiz.me>
Date: Sat, 13 May 2017 18:12:30 +0200
Subject: community/syncthing13: fix s390x build

---
 community/syncthing13/APKBUILD | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'community/syncthing13/APKBUILD')

diff --git a/community/syncthing13/APKBUILD b/community/syncthing13/APKBUILD
index 0b8a39dbbf..a2ae49f5ad 100644
--- a/community/syncthing13/APKBUILD
+++ b/community/syncthing13/APKBUILD
@@ -12,13 +12,11 @@ arch="all !ppc64le"
 license="MPLv2"
 pkgusers="$_realname"
 pkggroups="$_realname"
-depends=""
-depends_dev=""
-makedepends="godep go"
+makedepends="go"
 install="$pkgname.pre-install"
-subpackages=""
 options="!strip"
 source="$_realname-$pkgver.tar.gz::https://github.com/syncthing/syncthing/archive/v$pkgver.tar.gz
+	net-30df40a6a17d00a985343756f9b1418c6897866e.tar.gz::https://github.com/golang/net/archive/30df40a6a17d00a985343756f9b1418c6897866e.tar.gz
 	$_realname.confd
 	$_realname.initd"
 
@@ -27,8 +25,13 @@ builddir="$srcdir/src/github.com/$_realname"
 
 prepare() {
 	default_prepare
+
 	mkdir -p "$builddir"
-	ln -s "$srcdir"/$_realname-$pkgver "$builddir"/$_realname || return 1
+	ln -s "$srcdir"/$_realname-$pkgver "$builddir"/$_realname
+	# fix IPv6 definition errors on s390x, remove when upstream
+	# updates vendor manifest!
+	rm -r "$builddir"/$_realname/vendor/golang.org/x/net
+	ln -s "$srcdir"/net-* "$builddir"/$_realname/vendor/golang.org/x/net
 }
 
 build() {
@@ -37,23 +40,16 @@ build() {
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/bin || return 1
-	install -d -o $_realname -g $_realname \
-		"$pkgdir"/var/lib/$_realname || return 1
-	mv "$builddir"/$_realname/bin/* \
-		"$pkgdir"/usr/bin || return 1
+	mkdir -p "$pkgdir"/usr/bin
+	install -d -o $_realname -g $_realname "$pkgdir"/var/lib/$_realname
+	mv "$builddir"/$_realname/bin/* "$pkgdir"/usr/bin
 	install -D -m755 "$srcdir"/$_realname.initd \
-		"$pkgdir"/etc/init.d/$_realname || return 1
+		"$pkgdir"/etc/init.d/$_realname
 	install -D -m644 "$srcdir"/$_realname.confd \
-		"$pkgdir"/etc/conf.d/$_realname || return 1
+		"$pkgdir"/etc/conf.d/$_realname
 }
 
-md5sums="3eb6d3e9fa73d2c29347d8192ab2185c  syncthing-0.13.10.tar.gz
-c4923d6df4d3e51274869c09ea46a3e1  syncthing.confd
-760e26e5ea2f1dce8ce149a45f5e99bb  syncthing.initd"
-sha256sums="a86c7948afabc6e7b07f217d5200fb1e36cde5bb13373d99cc67d5dc991ce3be  syncthing-0.13.10.tar.gz
-da396f944d7b5b2e4f5a7a9a3a7b31529cf359ef7ebecec4c48383d0c8b6821e  syncthing.confd
-4d7c1de71cfc415d716471f32fdbb1693597f0209167e4c4ea302478481ab9b3  syncthing.initd"
 sha512sums="199c38644a7e5d43777ca2e497d5304d8e77485d21aeed9a00efc74dd98bfb0c473dd0bf3230b8e1e9742315915419f198bb8d0a9b294d2f6fe918b6e0175812  syncthing-0.13.10.tar.gz
+6f8705b61f6447328cd82e1b676fbfcb71dbd9aada5a592993b579c310fb617d7d370c0e11b8f1e8e04e4fdbbf336a1a5a540394141cc1eda3bf53d91b0f69f1  net-30df40a6a17d00a985343756f9b1418c6897866e.tar.gz
 b19cc3d802caa33f4d06852de590d2d984c12cf27d0540162cd7195da4f3f149c83c72e7a10f385b32b27fff6f39d33698e7402442a3f32a9da136c5d19059ae  syncthing.confd
 21fa7b0090e579ad0f02bb8cc9a78736eb99811613823bf12d477262da2281543d07b47ae0888e2e3876a687bf4cab3c89405447373a9c5ab2915989c5f9dce8  syncthing.initd"
-- 
cgit v1.2.3