Go r59
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
parent
b01ef7cb80
commit
e1f7c8bc89
1 changed files with 4 additions and 36 deletions
|
@ -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;' |
|
||||
|
|
Loading…
Reference in a new issue