summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Perez de Castro2020-05-12 16:10:31 +0300
committerAdrian Perez de Castro2020-05-12 16:10:31 +0300
commit81551ddff6cd40ed0bb43ce3fc9b2dc7ed6495e8 (patch)
tree79cc8e138ec960c236e9978c9ca084fa1f1f62ac
parentcd813648e8b541ca913f31d9051aee7d145952f9 (diff)
downloadaur-81551ddff6cd40ed0bb43ce3fc9b2dc7ed6495e8.tar.gz
Do not require godep as build dependency
The source tree has a vendored copy of the needed source dependencies, so now that we have Go 1.6+ in the Arch repositories we can use a plain "go build ." to use the vendored sources instead.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD16
2 files changed, 8 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5463138e6ff..af98a2d65c0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
pkgbase = mstat-git
pkgdesc = Fine-grained, cgroup-based tool for profiling memory usage over time of a process tree
pkgver = r25.497eeee
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/bpowers/mstat
arch = x86_64
license = custom:ISC
makedepends = git
makedepends = go-pie
- makedepends = godep
depends = glibc
source = mstat-git::git+https://github.com/bpowers/mstat
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index eac5867a53d9..28fdcabdc701 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
pkgname=mstat-git
pkgdesc='Fine-grained, cgroup-based tool for profiling memory usage over time of a process tree'
pkgver=r25.497eeee
-pkgrel=1
+pkgrel=2
url=https://github.com/bpowers/mstat
license=(custom:ISC)
-makedepends=(git go-pie godep)
+makedepends=(git go-pie)
depends=(glibc)
arch=(x86_64)
source=("${pkgname}::git+${url}")
@@ -25,29 +25,27 @@ prepare ()
{
mkdir -p "${srcdir}/_go/src/github.com/bpowers/"
ln -rTsf "${pkgname}" "${srcdir}/_go/src/github.com/bpowers/mstat"
- cd "$_"
- GOPATH="${srcdir}/_go" godep get -v
}
build ()
{
cd "${srcdir}/_go/src/github.com/bpowers/mstat"
local curdir=$(pwd)
- GOPATH="${srcdir}/_go" go install -v \
+ GOPATH="${srcdir}/_go" go build -v \
-gcflags "all=-trimpath=${curdir}" \
-asmflags "all=-trimpath=${curdir}" \
- -ldflags "-extldflags ${LDFLAGS}" \
- ./...
+ -ldflags "-extldflags '${LDFLAGS}'" \
+ .
}
check ()
{
cd "${srcdir}/_go/src/github.com/bpowers/mstat"
- GOPATH="${srcdir}/_go" go test ./...
+ GOPATH="${srcdir}/_go" go test .
}
package ()
{
- install -Dm755 _go/bin/mstat "${pkgdir}/usr/bin/mstat"
+ install -Dm755 "${pkgname}/mstat" "${pkgdir}/usr/bin/mstat"
install -Dm644 "${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}