diff options
| author | Dominyk Tiller | 2015-01-13 15:36:17 +0000 |
|---|---|---|
| committer | Jack Nagel | 2015-01-13 20:18:45 -0500 |
| commit | fd340838a00d27c6ca7f65147e3d6032afe66148 (patch) | |
| tree | 60323719db88c9640f1e8e068f03491f5463d5ac | |
| parent | ffb86df59e175b4c1a09df0aca5e864aafa0d8c7 (diff) | |
| download | homebrew-fd340838a00d27c6ca7f65147e3d6032afe66148.tar.bz2 | |
apr-util: add universal option
Closes #35811.
Closes #35827.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/apr-util.rb | 4 | ||||
| -rw-r--r-- | Library/Formula/apr.rb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Library/Formula/apr-util.rb b/Library/Formula/apr-util.rb index a4e106ab9..cd740016a 100644 --- a/Library/Formula/apr-util.rb +++ b/Library/Formula/apr-util.rb @@ -11,11 +11,15 @@ class AprUtil < Formula keg_only :provided_by_osx, "Apple's CLT package contains apr." + option :universal + depends_on "apr" depends_on "openssl" depends_on "postgresql" => :optional def install + ENV.universal_binary if build.universal? + # Stick it in libexec otherwise it pollutes lib with a .exp file. args = %W[ --prefix=#{libexec} diff --git a/Library/Formula/apr.rb b/Library/Formula/apr.rb index b3211301a..9dab246c9 100644 --- a/Library/Formula/apr.rb +++ b/Library/Formula/apr.rb @@ -14,6 +14,8 @@ class Apr < Formula option :universal def install + ENV.universal_binary if build.universal? + # Configure switch unconditionally adds the -no-cpp-precomp switch # to CPPFLAGS, which is an obsolete Apple-only switch that breaks # builds under non-Apple compilers and which may or may not do anything anymore. @@ -25,12 +27,8 @@ class Apr < Formula # The internal libtool throws an enormous strop if we don't do... ENV.deparallelize - args = %W[--prefix=#{libexec}] - - args << "--build=i386-apple-darwin" if build.universal? - # Stick it in libexec otherwise it pollutes lib with a .exp file. - system "./configure", *args + system "./configure", "--prefix=#{libexec}" system "make", "install" bin.install_symlink Dir["#{libexec}/bin/*"] end |