From e1f7c8bc894564c82ad98412aeb9b1259f10f80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mart=C3=ADnez?= Date: Sat, 6 Aug 2011 05:00:25 +0200 Subject: [PATCH] Go r59 Signed-off-by: Adam Vandenberg --- Formula/go.rb | 40 ++++------------------------------------ 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/Formula/go.rb b/Formula/go.rb index 33803d1c8b..91843a5446 100644 --- a/Formula/go.rb +++ b/Formula/go.rb @@ -1,15 +1,14 @@ require 'formula' -require 'hardware' class Go < Formula if ARGV.include? "--use-git" - url 'https://github.com/tav/go.git', :tag => 'release.r58.1' + url 'https://github.com/tav/go.git', :tag => 'release.r59' head 'https://github.com/tav/go.git' else - url 'http://go.googlecode.com/hg/', :revision => 'release.r58.1' + url 'http://go.googlecode.com/hg/', :revision => 'release.r59' head 'http://go.googlecode.com/hg/' end - version 'r58.1' + version 'r59' homepage 'http://golang.org' skip_clean 'bin' @@ -19,13 +18,12 @@ class Go < Formula end def install - ENV.j1 # Building in parallel fails prefix.install %w[src include test doc misc lib favicon.ico AUTHORS] Dir.chdir prefix mkdir %w[pkg bin] Dir.chdir 'src' do - # Some tests fail on Lion, so do this instead of "./all.bash" + # Tests take a very long time to run. Build only system "./make.bash" end @@ -34,33 +32,3 @@ class Go < Formula rm_rf %w[include test] end end - -__END__ -diff --git a/src/pkg/deps.bash b/src/pkg/deps.bash -index a8e3dfc..2095ec1 100755 ---- a/src/pkg/deps.bash -+++ b/src/pkg/deps.bash -@@ -15,7 +15,13 @@ fi - - # Get list of directories from Makefile - dirs=$(gomake --no-print-directory echo-dirs) --dirpat=$(echo $dirs C | sed 's/ /|/g; s/.*/^(&)$/') -+dirpat=$(echo $dirs C | awk '{ -+ for(i=1;i<=NF;i++){ -+ x=$i -+ gsub("/", "\\/", x) -+ printf("/^(%s)$/\n", x) -+ } -+}') - - for dir in $dirs; do ( - cd $dir || exit 1 -@@ -30,7 +36,7 @@ for dir in $dirs; do ( - deps=$( - sed -n '/^import.*"/p; /^import[ \t]*(/,/^)/p' $sources /dev/null | - cut -d '"' -f2 | -- egrep "$dirpat" | -+ awk "$dirpat" | - grep -v "^$dir\$" | - sed 's/$/.install/' | - sed 's;^C\.install;runtime/cgo.install;' |