public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-lang/go: go-1.0.2.ebuild go-9999.ebuild
@ 2012-08-07 19:04 William Hubbs (williamh)
  0 siblings, 0 replies; only message in thread
From: William Hubbs (williamh) @ 2012-08-07 19:04 UTC (permalink / raw
  To: gentoo-commits

williamh    12/08/07 19:04:33

  Modified:             go-1.0.2.ebuild go-9999.ebuild
  Log:
  add CTARGET support for the arm architecture
  
  (Portage version: 2.2.0_alpha120/cvs/Linux i686)

Revision  Changes    Path
1.2                  dev-lang/go/go-1.0.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-1.0.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-1.0.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-1.0.2.ebuild?r1=1.1&r2=1.2

Index: go-1.0.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- go-1.0.2.ebuild	30 Jul 2012 18:49:38 -0000	1.1
+++ go-1.0.2.ebuild	7 Aug 2012 19:04:32 -0000	1.2
@@ -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 @@
 	# 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_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_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()



1.6                  dev-lang/go/go-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/go/go-9999.ebuild?r1=1.5&r2=1.6

Index: go-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/go/go-9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- go-9999.ebuild	30 Jul 2012 18:49:38 -0000	1.5
+++ go-9999.ebuild	7 Aug 2012 19:04:32 -0000	1.6
@@ -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 @@
 	# 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_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()





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2012-08-07 19:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-07 19:04 [gentoo-commits] gentoo-x86 commit in dev-lang/go: go-1.0.2.ebuild go-9999.ebuild William Hubbs (williamh)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox