diff options
author | William Hubbs <williamh@gentoo.org> | 2012-08-07 19:04:32 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2012-08-07 19:04:32 +0000 |
commit | 0fec4fb6a66c67f240bc00407a0e1ca383977ef8 (patch) | |
tree | 4eedc1c66893887105ae4b801d69446547af1802 /dev-lang | |
parent | old (diff) | |
download | historical-0fec4fb6a66c67f240bc00407a0e1ca383977ef8.tar.gz historical-0fec4fb6a66c67f240bc00407a0e1ca383977ef8.tar.bz2 historical-0fec4fb6a66c67f240bc00407a0e1ca383977ef8.zip |
add CTARGET support for the arm architecture
Package-Manager: portage-2.2.0_alpha120/cvs/Linux i686
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/go/Manifest | 10 | ||||
-rw-r--r-- | dev-lang/go/go-1.0.2.ebuild | 25 | ||||
-rw-r--r-- | dev-lang/go/go-9999.ebuild | 28 |
3 files changed, 37 insertions, 26 deletions
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index a00d0b4a8281..4eeb9170233e 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -3,14 +3,14 @@ Hash: SHA256 AUX go-1.0.2-hardened.patch 1306 SHA256 793f3b25c8fdcaa39415388ee534aabeceb48c2c08ce1f59d7fa16abaf1034d2 SHA512 d31a11157884e6ea03d21c8bfab03087264f458ef120250e4e919a7eb595f30fbde913bb970918b0cb3af86ea6aefa59ab254af84a9295ab933f045a60e31085 WHIRLPOOL dcafb608fc2e1a2e4d72dfca7d0a58543f8a05a6f99502f74e4558764be33536392bbc63ef1c7c7fe21b7cf8e26b3cea46feee3d2d376bf4458f3ce6d16691ee DIST go1.0.2.src.tar.gz 9676404 SHA256 70fcfb455087c14cc59b7a65c78003fcd1323d73f9b991c1e52db535d6bc95a8 SHA512 ca91a5985236f78c90bda9a1ec652b2b34c2cde3048c0b0c8c0a466ee85b1174d399184a25267959262b8388f51e3eaf2dd39909ec3474765b2c14006c970a23 WHIRLPOOL a6a2ea7971b2283b0aa52877b8d85357d59912e35b3968bb4ecd3a0470bb57638174a28b993e74b0fa6238a49360dcab53807ec84855f4f50122f2feebcc6c33 -EBUILD go-1.0.2.ebuild 3151 SHA256 f5e729a7828abd521176bbffb39fe5bec34ba0deb1b1b961e021d15509df01c1 SHA512 3d53f2e98a841695498602cd7796ad8ae5e755dd531a874bc7f2082fad93f5cebfaf94ad9d33e75e0fde856bbd946d21764a3f928976a8789497cfb53d9128bb WHIRLPOOL 54eb5287c8fa9b24a496136341541d469f3093617de87f046d40f76c5307f2c667d3d03925822efef420d90a53fc4c9c4de8ee68d76f9ca4d46f31e3c9059673 -EBUILD go-9999.ebuild 3150 SHA256 8320d3467d468918fe2a0b7d3aacdede0f723e36b10a3e21d875d151373dfbb9 SHA512 82a2df60d1814843c133d464337b3e09bcf30d38f197dde8d16718e599bdf666548819116e6c3b3d2b97752ed557e28bb3f307729d129737f9a3fed104271752 WHIRLPOOL ca5ef30776bd70311a991f66f58985827f9c447e916e35b1a347f76d3762232fe82c551257462988ffb929884dd6bad7704be718310455dea5c6ed08419f0941 +EBUILD go-1.0.2.ebuild 3187 SHA256 c343dd7ecd810f20aa17c619a4412bd5b398cd02761e6e481985500abd4e47fe SHA512 e49cf85b1517ca61e5974f9544b731c917c18e81526bff10b82a12476150dd26417fc88adac777d4fdfa8d96a4d5d39864190a1e40d1c18adf386f27ccb03741 WHIRLPOOL 212dfd7f4239eb01fb80f5777f15f5d30be4783b08262f96b35d8f150d75f47d6c48829c5b51ea2f5de7b2c25eab934f85af75ab52234619d7ce3866ffc7bf84 +EBUILD go-9999.ebuild 3109 SHA256 3ffd25fb9a228d8d7874140c6b79923f90bbd8b6fc2adc0ec943c8ad451d395c SHA512 c9cb61e2fc6bda061f42d629f717f5bb484a0936b1622bed7416849472bccdd6a2ab2a462d216aead0fd4e58d6d047396abd4619e09986774677a7bd6af31a43 WHIRLPOOL 56f513daa73b0886ce45aff75c4ce448eea2704131edded14f690023d80a5f0243c149a898b4a852c9605a26fd9af89477683921674b7fea7308789681b134f0 MISC ChangeLog 1222 SHA256 6dec4e2e70062cf81c293ddec24511560d238e28aa7411a2f1e9430041bb325a SHA512 ec092cc811f2b798bb26d72528bf3c1eadc77341fbb1c2ee4d023ffc379ff4ac8b19a778749e3014531e2101f259681ee7b813004961eb66b1082e66fcc76bb8 WHIRLPOOL 84c9bfecf9c59c959e33c9102b3358e6f23062a4d769e994d9926d2f4a2412ffe89c24426b9335122d58c696f06220f58d284e6ca5e03ac65f0dda48b9b36333 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlAYP+UACgkQblQW9DDEZTgkwwCgnfP/b9P9hphodtT5AC0sbeYV -HtwAnRqzW/kVRM64BNMjUF7cEvBW5d3K -=shsT +iEYEAREIAAYFAlAhZssACgkQblQW9DDEZTjOwgCdEnj3NyC52BgQ4qGgQ38iWbAJ +H6EAnRQoS5texlRlVohnzpNPRB9zgO3B +=Z9vp -----END PGP SIGNATURE----- diff --git a/dev-lang/go/go-1.0.2.ebuild b/dev-lang/go/go-1.0.2.ebuild index 98173439404b..3073cb4c97c8 100644 --- a/dev-lang/go/go-1.0.2.ebuild +++ b/dev-lang/go/go-1.0.2.ebuild @@ -1,14 +1,16 @@ # 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.2.ebuild,v 1.1 2012/07/30 18:49:38 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.2.ebuild,v 1.2 2012/08/07 19:04:32 williamh Exp $ EAPI=4 -EHG_REPO_URI="https://go.googlecode.com/hg" +export CTARGET=${CTARGET:-${CHOST}} -[[ ${PV} == 9999 ]] && vcs=mercurial - -inherit $vcs bash-completion-r1 elisp-common eutils +if [[ ${PV} = 9999 ]]; then + EHG_REPO_URI="https://go.googlecode.com/hg" + inherit mercurial +fi +inherit bash-completion-r1 elisp-common eutils if [[ ${PV} != 9999 ]]; then SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz" @@ -35,7 +37,9 @@ RDEPEND="bash-completion? ( app-shells/bash-completion ) # These are _NOT_ libraries, and should not be stripped. STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" -[[ ${PV} == 9999 ]] || S="${WORKDIR}"/go +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}"/go +fi src_prepare() { @@ -47,11 +51,13 @@ src_prepare() src_compile() { - export HOST_EXTRA_CFLAGS="${CFLAGS}" - export HOST_EXTRA_LDFLAGS="${LDFLAGS}" export GOROOT_FINAL=/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" + if [[ $CTARGET = arm5* ]] + then + export GOARM=5 + fi cd src ./make.bash || die "build failed" @@ -65,7 +71,8 @@ src_compile() src_test() { cd src - PATH="$GOBIN:${PATH}" ./run.bash --no-rebuild --banner || die "tests failed" + PATH="${GOBIN}:${PATH}" \ + ./run.bash --no-rebuild --banner || die "tests failed" } src_install() diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild index 46adc42870d9..991025d747d6 100644 --- a/dev-lang/go/go-9999.ebuild +++ b/dev-lang/go/go-9999.ebuild @@ -1,14 +1,16 @@ # 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-9999.ebuild,v 1.5 2012/07/30 18:49:38 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v 1.6 2012/08/07 19:04:32 williamh Exp $ EAPI=4 -EHG_REPO_URI="https://go.googlecode.com/hg" +export CTARGET=${CTARGET:-${CHOST}} -[[ ${PV} == 9999 ]] && vcs=mercurial - -inherit $vcs bash-completion-r1 elisp-common eutils +if [[ ${PV} = 9999 ]]; then + EHG_REPO_URI="https://go.googlecode.com/hg" + inherit mercurial +fi +inherit bash-completion-r1 elisp-common eutils if [[ ${PV} != 9999 ]]; then SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz" @@ -35,23 +37,24 @@ RDEPEND="bash-completion? ( app-shells/bash-completion ) # These are _NOT_ libraries, and should not be stripped. STRIP_MASK="/usr/lib/go/pkg/linux*/*.a" -[[ ${PV} == 9999 ]] || S="${WORKDIR}"/go +if [[ ${PV} != 9999 ]]; then + S="${WORKDIR}"/go +fi src_prepare() { - if [[ ${PV} != 9999 ]]; then - epatch "${FILESDIR}"/${P}-hardened.patch - fi epatch_user } src_compile() { - export HOST_EXTRA_CFLAGS="${CFLAGS}" - export HOST_EXTRA_LDFLAGS="${LDFLAGS}" export GOROOT_FINAL=/usr/lib/go export GOROOT="$(pwd)" export GOBIN="${GOROOT}/bin" + if [[ $CTARGET = arm5* ]] + then + export GOARM=5 + fi cd src ./make.bash || die "build failed" @@ -65,7 +68,8 @@ src_compile() src_test() { cd src - PATH="$GOBIN:${PATH}" ./run.bash --no-rebuild --banner || die "tests failed" + PATH="${GOBIN}:${PATH}" \ + ./run.bash --no-rebuild --banner || die "tests failed" } src_install() |