diff options
Diffstat (limited to 'app-admin/consul/consul-0.6.3.ebuild')
| -rw-r--r-- | app-admin/consul/consul-0.6.3.ebuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild index 99b94506fbbe..a2ff9c660b03 100644 --- a/app-admin/consul/consul-0.6.3.ebuild +++ b/app-admin/consul/consul-0.6.3.ebuild @@ -4,7 +4,7 @@ EAPI=5 -inherit golang-base systemd user +inherit git-r3 golang-base systemd user GO_PN="github.com/hashicorp/consul" @@ -108,7 +108,7 @@ src_unpack() { cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die while read -r path; do rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \ - "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die + "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d) } @@ -129,7 +129,7 @@ src_prepare() { } src_compile() { - PATH=${PATH}:${WORKDIR}/bin XC_ARCH=${ARCH} XC_OS=${KERNEL} emake + PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake } src_install() { @@ -158,13 +158,13 @@ src_install() { while read -r -d '' x; do x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} || - -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue + [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || + -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue rm -rf "${WORKDIR}"/src/${x} done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) insopts -m0644 -p # preserve timestamps for bug 551486 - insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*} - doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN} + insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*} + doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} insinto /usr/lib/go/src/${GO_PN%/*} doins -r "${WORKDIR}"/src/${GO_PN} } |