Skip to content

Possibility to install last versions of OTP + disable SSL EC if needed #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zpetr wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Possibility to install last versions of OTP + disable SSL EC if needed #29

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e85f16
Fix savannah.gnu.org timeout: gnulib repos is changed
zpetr Aug 28, 2014
5edfdd3
Disable SSL EC in some cases
zpetr Sep 11, 2014
ed70ce3
Remove appmon lib for new OTP versions
zpetr Sep 12, 2014
cc13991
[OTP-17 optimisation] Some librairies were excluded from new OTP vers…
zpetr Sep 12, 2014
166514e
Prepare Pull request for OTP bug fixes
zpetr Sep 15, 2014
9cccbb1
fix jhs/build-couchdb#24, fix jhs/build-couchdb#26
zpetr Sep 15, 2014
2e446a9
Dir.exists is replaced by File.directory for Ruby 1.8 compatibility (…
zpetr Sep 16, 2014
c374ed8
Cflags ENV variable
zpetr Sep 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions tasks/erlang.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ namespace :erlang do
cflags += ' -I/opt/csw/include -L/opt/csw/lib'
ldflags = '-L/opt/csw/lib'
end

if ENV['erl_cflags']
env_erl_cflags = ENV['erl_cflags']
cflags += " #{env_erl_cflags}"
end

configure = [
"CFLAGS='#{cflags}'",
"LDFLAGS='#{ldflags}'",
Expand Down Expand Up @@ -91,7 +95,9 @@ namespace :erlang do
end

OTP_SKIP_COMPILE.each do |lib|
skip_otp_app(lib) unless otp_app_useful?(lib)
if File.directory?("#{source}/lib/#{lib}")
skip_otp_app(lib) unless otp_app_useful?(lib)
end
end

erlang_confopts = ENV['erlang_confopts'] || ""
Expand All @@ -105,7 +111,9 @@ namespace :erlang do
# Redo the SKIP files. This works around lib/odbc/configure removing its own SKIP file for some reason. Perhaps other
# modules do too.
OTP_SKIP_COMPILE.each do |lib|
skip_otp_app(lib) unless otp_app_useful?(lib)
if File.directory?("#{source}/lib/#{lib}")
skip_otp_app(lib) unless otp_app_useful?(lib)
end
end

gmake
Expand Down Expand Up @@ -142,7 +150,9 @@ namespace :erlang do
lib = "#{erlang}/lib"

(OTP_REMOVE + OTP_SKIP_COMPILE).each do |component|
sh "rm -rf #{lib}/#{component}-*" unless otp_app_useful?(component)
if File.directory?("#{lib}/#{component}")
sh "rm -rf #{lib}/#{component}-*" unless otp_app_useful?(component)
end
end

# Remove unnecessary directories for running.
Expand Down