Skip to content

Commit

Permalink
Fix for openssl when building 5.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Jens Lind committed Sep 5, 2015
1 parent 2783006 commit 521c343
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/puppet/provider/php_version/php_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ def install(version)
makefile = "#{@resource[:phpenv_root]}/php-src/Makefile"
makefileOutdata = File.read(makefile).gsub(/^INSTALL_IT = \$\(mkinstalldirs\) '([^']+)' (.+) LIBEXECDIR=([^\s]+) (.+)$/, "INSTALL_IT = $(mkinstalldirs) '#{@resource[:phpenv_root]}/versions/#{@resource[:version]}/libexec/apache2' \\2 LIBEXECDIR='#{@resource[:phpenv_root]}/versions/#{@resource[:version]}/libexec/apache2' \\4")

# Fix for openssl when building 5.5
# Discussed here: https://github.com/Homebrew/homebrew-php/issues/1941
makefileOutdata = makefileOutdata.gsub(/^EXTRA_LIBS = (.*)/, "EXTRA_LIBS = \\1 #{@resource[:homebrew_path]}/opt/openssl/lib/libssl.dylib #{@resource[:homebrew_path]}/opt/openssl/lib/libcrypto.dylib")

File.open(makefile, 'w') do |out|
out << makefileOutdata
end
Expand Down

0 comments on commit 521c343

Please sign in to comment.