From 0092422392ab2293ecafb2948749469f079649e7 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 3 Jun 2014 15:16:39 -0500 Subject: [PATCH] llvm3[345]: omit point release from version suffix Fixes #449. --- llvm33.rb | 5 +++-- llvm34.rb | 5 +++-- llvm35.rb | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/llvm33.rb b/llvm33.rb index e67ed16d1114b8..f5e66fd340d604 100644 --- a/llvm33.rb +++ b/llvm33.rb @@ -2,6 +2,7 @@ class Llvm33 < Formula homepage 'http://llvm.org/' + revision 1 stable do url 'http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz' @@ -223,13 +224,13 @@ def install # Link executables to bin and add suffix to avoid conflicts Dir.glob(install_prefix/'bin/*') do |exec_path| basename = File.basename(exec_path) - bin.install_symlink exec_path => "#{basename}-#{version}" + bin.install_symlink exec_path => "#{basename}-#{ver}" end # Also link man pages Dir.glob(install_prefix/'share/man/man1/*') do |manpage| basename = File.basename(manpage, ".1") - man1.install_symlink manpage => "#{basename}-#{version}.1" + man1.install_symlink manpage => "#{basename}-#{ver}.1" end end diff --git a/llvm34.rb b/llvm34.rb index 8c0601598d3bc2..e31e875a9e52f0 100644 --- a/llvm34.rb +++ b/llvm34.rb @@ -2,6 +2,7 @@ class Llvm34 < Formula homepage 'http://llvm.org/' + revision 1 stable do url 'http://llvm.org/releases/3.4.1/llvm-3.4.1.src.tar.gz' @@ -209,13 +210,13 @@ def install # Link executables to bin and add suffix to avoid conflicts Dir.glob(install_prefix/'bin/*') do |exec_path| basename = File.basename(exec_path) - bin.install_symlink exec_path => "#{basename}-#{version}" + bin.install_symlink exec_path => "#{basename}-#{ver}" end # Also link man pages Dir.glob(install_prefix/'share/man/man1/*') do |manpage| basename = File.basename(manpage, ".1") - man1.install_symlink manpage => "#{basename}-#{version}.1" + man1.install_symlink manpage => "#{basename}-#{ver}.1" end end diff --git a/llvm35.rb b/llvm35.rb index bd3b270b6998ab..3b9100e518fa5d 100644 --- a/llvm35.rb +++ b/llvm35.rb @@ -178,13 +178,13 @@ def install # Link executables to bin and add suffix to avoid conflicts Dir.glob(install_prefix/'bin/*') do |exec_path| basename = File.basename(exec_path) - bin.install_symlink exec_path => "#{basename}-#{version}" + bin.install_symlink exec_path => "#{basename}-#{ver}" end # Also link man pages Dir.glob(install_prefix/'share/man/man1/*') do |manpage| basename = File.basename(manpage, ".1") - man1.install_symlink manpage => "#{basename}-#{version}.1" + man1.install_symlink manpage => "#{basename}-#{ver}.1" end end