changes build process according to the consense of the discussion on arch-dev-public

this version conflicts go-pie, to make sure you replace it from the system

3 files changed, 13 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2eea30dc8f5c..9f97e0f085cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = go-ipfs-git
 	pkgdesc = A peer-to-peer hypermedia distribution protocol
-	pkgver = 0.5.0rc4.r0.g
+	pkgver = 0.5.0rc4.r0.g116999a19
 	pkgrel = 1
 	url = https://github.com/ipfs/go-ipfs
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = MIT
-	makedepends = go-pie>=2:1.14.2-1
+	makedepends = go>=2:1.14.2-1
 	makedepends = git
 	optdepends = fuse2: for mounting/advanced use
 	optdepends = bash-completion: bash completion support
 	provides = go-ipfs
 	conflicts = go-ipfs
+	conflicts = go-pie
 	source = git+https://github.com/ipfs/go-ipfs.git
 	source = ipfs.service
 	source = ipfs@.service
diff --git a/PKGBUILD b/PKGBUILD
index 0229c0c7876b..8b2a00ea7944 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,17 @@
 
 _pkgname=go-ipfs
 pkgname=$_pkgname-git
-pkgver=0.5.0rc1.r26.g6cb3ca41d
-pkgrel=3
+pkgver=0.5.0rc4.r0.g116999a19
+pkgrel=1
 pkgdesc='A peer-to-peer hypermedia distribution protocol'
 url="https://github.com/ipfs/$_pkgname"
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-makedepends=("go-pie>=2:1.14.2-1" git)
+makedepends=("go>=2:1.14.2-1" git)
 optdepends=('fuse2: for mounting/advanced use'
             'bash-completion: bash completion support')
 provides=("$_pkgname")
-conflicts=("$_pkgname")
+conflicts=("$_pkgname" go-pie)
 source=("git+${url}.git"
 	"ipfs.service"
 	"ipfs@.service")
@@ -30,14 +30,18 @@ pkgver() {
 	#VERSION=$(grep -E "^const CurrentVersionNumber = " version.go | awk '{ print $4 }' | sed 's/"//g')
 	VERSION=$(git tag | grep -vE "floodsub|sharding-pre" | grep -ve "-dev" | sed 's/-/~/g' | sort --version-sort --reverse | sed 's/~/-/g' | head -n1)
 	COUNT=$(git rev-list "$VERSION.." --count)
-	CHKSUM=$(git rev-list "$VERSION.." | head -n1)
+	CHKSUM=$(git rev-list master | head -n1)
 	VERSION=$(echo "$VERSION" | sed 's/^v//' | sed 's/-//')
 	printf "%s.%s.%s" "$VERSION" "r$COUNT" "g${CHKSUM:0:9}"
 }
 
 build() {
 	cd "$srcdir/$_pkgname"
-	make build
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	make GOFLAGS="-buildmode=pie -trimpath -modcacherw" build 
 }
 
 package() {
diff --git a/go-ipfs-git.install b/go-ipfs-git.install
deleted file mode 100644
index 2c98921d58af..000000000000
--- a/go-ipfs-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-	OLD="$2"
-	NEW="$1"
-
-	if [ $(vercmp "0.4.3dev" "$OLD") -gt 0 ]; then
-		echo
-		echo "    ################################################"
-		echo "             IPFS repo format hash changed."
-		echo "          You will have to run migrations tool."
-		echo "    See: https://github.com/ipfs/fs-repo-migrations/"
-		echo "    ################################################"
-	fi
-}