Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 66cc4613b371
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 982918f4c35e
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 6, 2016

  1. Copy the full SHA
    1bec103 View commit details
  2. Copy the full SHA
    a6e5760 View commit details
  3. Merge pull request #3552 from andre-richter/master

    If on OS X, check for homebrew-supplied openssl libraries
    brixen committed Jan 6, 2016
    Copy the full SHA
    982918f View commit details
Showing with 25 additions and 6 deletions.
  1. +25 −6 configure
31 changes: 25 additions & 6 deletions configure
Original file line number Diff line number Diff line change
@@ -277,6 +277,11 @@ class Configure
@runtime_gems_dir ||= "#{@build_prefix}#{@runtimedir}/gems"
end

def add_opt_dir(dir)
@include_dirs << "#{dir}/include"
@lib_dirs << "#{dir}/lib" << "#{dir}/lib64"
end

def options
@options = Rubinius::Options.new "Usage: configure [options]", 30
o = @options
@@ -366,8 +371,7 @@ class Configure

o.on "--with-opt-dir", "DIR", "Add DIR/include and DIR/lib to include and library search paths" do |dir|
dir.split(File::PATH_SEPARATOR).each do |d|
@include_dirs << "#{d}/include"
@lib_dirs << "#{d}/lib" << "#{d}/lib64"
add_opt_dir(d)
end
end

@@ -1036,8 +1040,7 @@ int main() { return tgetnum(""); }

def detect_build_dirs
["/usr/local", "/opt/local", "/usr/pkg"].each do |dir|
@include_dirs << "#{dir}/include"
@lib_dirs << "#{dir}/lib" << "#{dir}/lib64"
add_opt_dir(dir)
end

@include_dirs = @include_dirs.select {|p| File.directory? p }
@@ -1174,7 +1177,7 @@ int main() { return tgetnum(""); }

def detect_features
# Default on *BSD is no execinfo
if RUBY_PLATFORM =~ /bsd/i and @features["execinfo"].configured.nil?
if @bsd and @features["execinfo"].configured.nil?
@features["execinfo"].configured = false
end

@@ -1406,7 +1409,6 @@ int main() { return tgetnum(""); }
end

def process
set_host
set_system_commands

enable_features
@@ -1859,7 +1861,9 @@ int main() { return tgetnum(""); }
end

options
set_host
parse ARGV
detect_homebrew_openssl_lib
create_directories
check_tools
check_force_clean
@@ -2073,6 +2077,21 @@ Available commands are:
fgrep llvm-config`.split
avail_binaries.reject { |fname| fname.include? 'libexec' }.last
end

# Returns true if the *brew* command is in the PATH and identifies
# itself with "Homebrew" when run interactively with -v argument.
def homebrew?
`echo quit | brew -v 2>&-`.start_with? 'Homebrew'
end

# Check if latest version of openssl is installed; if so, add to include
# and libs
def detect_homebrew_openssl_lib
if @darwin && homebrew? && (`brew list`.split("\n").include? 'openssl')
add_opt_dir(`brew --prefix openssl`.chomp)
end
end

end

STDOUT.sync = true