gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

app-admin/vault: use go env GOOS and GOARCH

Browse Source 
Package-Manager: portage-2.2.27
This commit is contained in:
Zac Medico
2016-01-23 09:06:00 -08:00
parent 61e21d9ee5
commit 26e70fa0d3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app-admin/vault/vault-0.1.2-r1.ebuild
View File

@@ -53,7 +53,7 @@ src_unpack() {
export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
while read -r -d '' x; do
rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
@@ -97,13 +97,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}
}

10
app-admin/vault/vault-9999.ebuild
View File

@@ -51,7 +51,7 @@ src_unpack() {
export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
while read -r -d '' x; do
rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
rm -rf "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src/github.com/awslabs"
@@ -93,13 +93,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}
}