From 4e85f16382a38e53eba3d9a41618b615976d4b23 Mon Sep 17 00:00:00 2001 From: pglushchenko Date: Thu, 28 Aug 2014 17:47:03 +0200 Subject: [PATCH 1/8] Fix savannah.gnu.org timeout: gnulib repos is changed --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 46f55411..3d012211 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = git://git.sv.gnu.org/autoconf-archive.git [submodule "dependencies/gnulib"] path = dependencies/gnulib - url = git://git.savannah.gnu.org/gnulib.git + url = git://github.com/gagern/gnulib From 5edfdd3474768240d243d1ffbb0486010f8ead29 Mon Sep 17 00:00:00 2001 From: zpetr Date: Thu, 11 Sep 2014 17:00:46 +0200 Subject: [PATCH 2/8] Disable SSL EC in some cases --- tasks/erlang.rake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index 24650e2e..9bd0e678 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -47,7 +47,10 @@ namespace :erlang do cflags += ' -I/opt/csw/include -L/opt/csw/lib' ldflags = '-L/opt/csw/lib' end - + if ENV['erl_cflags'] + cflags += ' '+ENV['erl_cflags'] + end + configure = [ "CFLAGS='#{cflags}'", "LDFLAGS='#{ldflags}'", From ed70ce3833bc9082d524478ec4393e8f96fa9146 Mon Sep 17 00:00:00 2001 From: zpetr Date: Fri, 12 Sep 2014 12:26:15 +0200 Subject: [PATCH 3/8] Remove appmon lib for new OTP versions --- tasks/erlang.rake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index 9bd0e678..87a00778 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -28,6 +28,10 @@ namespace :erlang do OTP_SKIP_COMPILE << "os_mon" OTP_SKIP_COMPILE << "otp_mibs" end + + if ENV['erl_checkout'] + OTP_REMOVE << "appmon" if /^tags\/OTP-/.match(ENV['erl_checkout']) + end file ERL_BIN => AUTOCONF_259 do source = "#{DEPS}/otp" From cc139911a8799f68d58f68651b3e17a44a7ef182 Mon Sep 17 00:00:00 2001 From: zpetr Date: Fri, 12 Sep 2014 17:13:35 +0200 Subject: [PATCH 4/8] [OTP-17 optimisation] Some librairies were excluded from new OTP versions --- tasks/erlang.rake | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index 87a00778..f14636f4 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -28,10 +28,6 @@ namespace :erlang do OTP_SKIP_COMPILE << "os_mon" OTP_SKIP_COMPILE << "otp_mibs" end - - if ENV['erl_checkout'] - OTP_REMOVE << "appmon" if /^tags\/OTP-/.match(ENV['erl_checkout']) - end file ERL_BIN => AUTOCONF_259 do source = "#{DEPS}/otp" @@ -98,7 +94,9 @@ namespace :erlang do end OTP_SKIP_COMPILE.each do |lib| - skip_otp_app(lib) unless otp_app_useful?(lib) + if Dir.exists?("#{source}/lib/#{lib}") + skip_otp_app(lib) unless otp_app_useful?(lib) + end end erlang_confopts = ENV['erlang_confopts'] || "" @@ -112,7 +110,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 Dir.exists?("#{source}/lib/#{lib}") + skip_otp_app(lib) unless otp_app_useful?(lib) + end end gmake @@ -149,7 +149,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 Dir.exists?("#{lib}/#{component}") + sh "rm -rf #{lib}/#{component}-*" unless otp_app_useful?(component) + end end # Remove unnecessary directories for running. From 166514ede623451c78ef02012abddf8b2e54954a Mon Sep 17 00:00:00 2001 From: zpetr Date: Mon, 15 Sep 2014 13:10:46 +0200 Subject: [PATCH 5/8] Prepare Pull request for OTP bug fixes --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 3d012211..46f55411 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ url = git://git.sv.gnu.org/autoconf-archive.git [submodule "dependencies/gnulib"] path = dependencies/gnulib - url = git://github.com/gagern/gnulib + url = git://git.savannah.gnu.org/gnulib.git From 9cccbb1523b2b4da71b1be4c38ac875bae40e4d2 Mon Sep 17 00:00:00 2001 From: zpetr Date: Mon, 15 Sep 2014 13:18:15 +0200 Subject: [PATCH 6/8] fix jhs/build-couchdb#24, fix jhs/build-couchdb#26 --- tasks/erlang.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index f14636f4..d92fd03a 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -48,7 +48,8 @@ namespace :erlang do ldflags = '-L/opt/csw/lib' end if ENV['erl_cflags'] - cflags += ' '+ENV['erl_cflags'] + env_erl_cflags = ENV['erl_cflags'] + cflags += " #{env_erl_cflags}" end configure = [ From 2e446a993139ed4bcd3f36663d78994bcbc4677a Mon Sep 17 00:00:00 2001 From: zpetr Date: Tue, 16 Sep 2014 10:55:43 +0200 Subject: [PATCH 7/8] Dir.exists is replaced by File.directory for Ruby 1.8 compatibility (fix jhs/build-couchdb#24) --- tasks/erlang.rake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index d92fd03a..4101b13d 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -48,8 +48,7 @@ namespace :erlang do ldflags = '-L/opt/csw/lib' end if ENV['erl_cflags'] - env_erl_cflags = ENV['erl_cflags'] - cflags += " #{env_erl_cflags}" + cflags += ' '+ENV['erl_cflags'] end configure = [ @@ -95,7 +94,7 @@ namespace :erlang do end OTP_SKIP_COMPILE.each do |lib| - if Dir.exists?("#{source}/lib/#{lib}") + if File.directory?("#{source}/lib/#{lib}") skip_otp_app(lib) unless otp_app_useful?(lib) end end @@ -111,7 +110,7 @@ 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| - if Dir.exists?("#{source}/lib/#{lib}") + if File.directory?("#{source}/lib/#{lib}") skip_otp_app(lib) unless otp_app_useful?(lib) end end @@ -150,7 +149,7 @@ namespace :erlang do lib = "#{erlang}/lib" (OTP_REMOVE + OTP_SKIP_COMPILE).each do |component| - if Dir.exists?("#{lib}/#{component}") + if File.directory?("#{lib}/#{component}") sh "rm -rf #{lib}/#{component}-*" unless otp_app_useful?(component) end end From c374ed84094401c9624a9369531b3ab2c01a2fc4 Mon Sep 17 00:00:00 2001 From: zpetr Date: Tue, 16 Sep 2014 11:02:46 +0200 Subject: [PATCH 8/8] Cflags ENV variable --- tasks/erlang.rake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/erlang.rake b/tasks/erlang.rake index 4101b13d..e8c2b068 100644 --- a/tasks/erlang.rake +++ b/tasks/erlang.rake @@ -48,7 +48,8 @@ namespace :erlang do ldflags = '-L/opt/csw/lib' end if ENV['erl_cflags'] - cflags += ' '+ENV['erl_cflags'] + env_erl_cflags = ENV['erl_cflags'] + cflags += " #{env_erl_cflags}" end configure = [