diff options
| author |   William Hubbs <williamh@gentoo.org> | 2012-05-15 23:31:52 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2012-05-15 23:31:52 +0000 |
| commit | 2b9f00f3567deac6e300e24d56b9689333d62779 (patch) | |
| tree | 074cfb52e0bdf2b18f0daaf0cb6ae6794c68d24a | |
| parent | keyword ~amd64-fbsd (diff) | |
| download | historical-2b9f00f3567deac6e300e24d56b9689333d62779.tar.gz historical-2b9f00f3567deac6e300e24d56b9689333d62779.tar.bz2 historical-2b9f00f3567deac6e300e24d56b9689333d62779.zip | |
Fix src_test so that it runs the tests correctly. They were failing on
initial install because the path did not contain $GOBIN.
Thanks to jdhore@gentoo.org for pointing this out.
Also add ~amd64 keyword per floppym@gentoo.org wrt #416133.
Package-Manager: portage-2.2.0_alpha105/cvs/Linux i686
| -rw-r--r-- | dev-lang/go/Manifest | 8 | ||||
| -rw-r--r-- | dev-lang/go/go-1.0.1.ebuild | 23 |
2 files changed, 13 insertions, 18 deletions
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index ba21bd154657..61e0d89352c1 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -3,14 +3,14 @@ Hash: SHA1 AUX go-1.0.1-hardened.patch 1503 RMD160 8f1da55b2e4feeac00789bd480dfa65fffcec8a8 SHA1 7f0767b201ebba4362ba84cbf901a6b9c7f4774e SHA256 decdc5ae8cf875bab581a279ef3602262de6530275f5ac48ab40965d5660f378 DIST go1.0.1.src.tar.gz 9617092 RMD160 4e2d8e33519b2fd3562a4c06762f02ee5014fa66 SHA1 fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6 SHA256 29cdba7bc909df7091d81f52049de023502b5b3351cd206094f2c2d9961c0315 -EBUILD go-1.0.1.ebuild 3330 RMD160 917425cc223be317be835e89e318fea981e65ae3 SHA1 11c7ace723ba4cb0c30465e83d4188cf2188a02f SHA256 fa6740e1e0c9d3a70cd7ae668c442da77c5e7f20651ad42df5a09b91c1b6a5d7 +EBUILD go-1.0.1.ebuild 3303 RMD160 7971f9efcd2fb17a56deddf1e95d28ad5f2513f7 SHA1 c2151906962fccca5938d992ba34e382b2445cbe SHA256 485591bab50c4ceb096a3d6f24b6169cfdc443e4b5998e6dceb103ef558f8830 EBUILD go-9999.ebuild 3329 RMD160 1ddd90b0b4b2639ccab493a2027b3aa065ebcf84 SHA1 8f85b90d2edc5372a92662c878d43e2edbb21b2f SHA256 f0b9920de2f9d2ff16f96d05a1193d891372801607c0e841166075672000acc7 MISC ChangeLog 669 RMD160 cb86c69a18de920acfef1758f3a8ce4fd948653c SHA1 9f66aeaed3a1a65e4de95c8a9a3add365171e0e4 SHA256 1859cbb6e6cb23e9c267f30e08a3d194bac78554a330d9457c16494bd22c6921 MISC metadata.xml 543 RMD160 25cf8ab8c7070f006278a9592fd8b8562c1ef26e SHA1 7c3c6c204466b7cc04abc043e7a7662bdb98602b SHA256 cd941b060081d57159d3e44b171ad76f6fdf56545d58b9577963ed1d20278fe7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk+ytrIACgkQblQW9DDEZTjVyQCeNDvnotTDsfNBCDrj347oE9Su -G+EAoKSLtoj+oKue1nPTWc6lerlVKLBQ -=Zu+h +iEUEARECAAYFAk+y53YACgkQblQW9DDEZTguqwCXZqtNKMy37zlf2pD3vEXwcTfo +bACbB5308pV1FVgn1iC00VdtLx2kY0U= +=C2Gj -----END PGP SIGNATURE----- diff --git a/dev-lang/go/go-1.0.1.ebuild b/dev-lang/go/go-1.0.1.ebuild index fea10c27c315..e6d84fffe8bc 100644 --- a/dev-lang/go/go-1.0.1.ebuild +++ b/dev-lang/go/go-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.1.ebuild,v 1.2 2012/05/15 20:03:48 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.1.ebuild,v 1.3 2012/05/15 23:31:52 williamh Exp $ EAPI=4 @@ -13,7 +13,7 @@ inherit $vcs bash-completion-r1 elisp-common eutils if [[ ${PV} != 9999 ]]; then SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* ~x86" + KEYWORDS="-* ~amd64 ~x86" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" @@ -42,15 +42,6 @@ STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" [[ ${PV} == 9999 ]] || S="${WORKDIR}"/go -export_settings() -{ - export HOST_EXTRA_CFLAGS="${CFLAGS}" - export HOST_EXTRA_LDFLAGS="${LDFLAGS}" - export GOROOT_FINAL=/usr/lib/go - export GOROOT="$(pwd)" - export GOBIN="${GOROOT}/bin" -} - src_prepare() { if [[ ${PV} != 9999 ]]; then @@ -60,7 +51,12 @@ src_prepare() src_compile() { - export_settings + export HOST_EXTRA_CFLAGS="${CFLAGS}" + export HOST_EXTRA_LDFLAGS="${LDFLAGS}" + export GOROOT_FINAL=/usr/lib/go + export GOROOT="$(pwd)" + export GOBIN="${GOROOT}/bin" + if [[ ${PV} != 9999 ]]; then use pax_kernel && opts="--pax-kernel" fi @@ -75,9 +71,8 @@ src_compile() src_test() { - export_settings cd src - ./run.bash --no-rebuild --banner || die "tests failed" + PATH="$GOBIN:${PATH}" ./run.bash --no-rebuild --banner || die "tests failed" } src_install() |