aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula/boost.rb
diff options
context:
space:
mode:
authorSimon Sigurdhsson2013-04-21 10:44:24 +0200
committerJack Nagel2013-04-21 23:48:50 -0500
commitd6a2964eabd34d2ba8e62b5e19dff5ffea24e527 (patch)
tree3ebc1c77cc3369893f1aac437ab86304a0ee861f /Library/Formula/boost.rb
parent451936cff52ec282efa45168366b018af2200246 (diff)
downloadhomebrew-d6a2964eabd34d2ba8e62b5e19dff5ffea24e527.tar.bz2
Remove global methods from formulae
Removes any global methods from formulae, and moves #kext_prefix (which seems to be at least somewhat abstractable) into the Formula class. The only formula with global methods is now aspell; it (and its generating script in contrib) has been changed to prefix that method with `aspell_`, to minimize the risk of name collisions. Closes #19331. Closes #19343. Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/boost.rb')
-rw-r--r--Library/Formula/boost.rb11
1 files changed, 2 insertions, 9 deletions
diff --git a/Library/Formula/boost.rb b/Library/Formula/boost.rb
index 2fd3012da..04ceaadbd 100644
--- a/Library/Formula/boost.rb
+++ b/Library/Formula/boost.rb
@@ -1,13 +1,5 @@
require 'formula'
-def needs_universal_python?
- build.universal? and not build.include? "without-python"
-end
-
-def boost_layout
- (build.include? "use-system-layout") ? "system" : "tagged"
-end
-
class UniversalPython < Requirement
satisfy { archs_for_command("python").universal? }
@@ -42,7 +34,7 @@ class Boost < Formula
option 'with-c++11', 'Compile using Clang, std=c++11 and stdlib=libc++' if MacOS.version >= :lion
option 'use-system-layout', 'Use system layout instead of tagged'
- depends_on UniversalPython if needs_universal_python?
+ depends_on UniversalPython if build.universal? and not build.include? "without-python"
depends_on "icu4c" if build.include? "with-icu"
depends_on MPIDependency.new(:cc, :cxx) if build.include? "with-mpi"
@@ -88,6 +80,7 @@ class Boost < Formula
bargs << '--without-icu'
end
+ boost_layout = (build.include? "use-system-layout") ? "system" : "tagged"
args = ["--prefix=#{prefix}",
"--libdir=#{lib}",
"-d2",