Download as
Browse Code »

Commit 888ecef6f5cd4d7d0d470b42f85d44f0344f4c8e

Authored by Jacob Vosmaer
1 parent bdd23b71
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Use standard omnibus-ruby build environments

Showing 6 changed files with 13 additions and 26 deletions   Show diff stats
config/software/git.rb
  Diff comments   View file @888ecef
@@ -28,13 +28,9 @@ source :url => "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.g @@ -28,13 +28,9 @@ source :url => "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.g
28 28
29 relative_path "git-#{version}" 29 relative_path "git-#{version}"
30 30
31 -env = {  
32 - "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
33 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
34 - "LD_RUN_PATH" => "#{install_dir}/embedded/lib",  
35 -}  
36 -  
37 build do 31 build do
  32 + env = with_standard_compiler_flags(with_embedded_path)
  33 +
38 command ["./configure", 34 command ["./configure",
39 "--prefix=#{install_dir}/embedded", 35 "--prefix=#{install_dir}/embedded",
40 "--with-curl=#{install_dir}/embedded", 36 "--with-curl=#{install_dir}/embedded",
config/software/gitlab-rails.rb
  Diff comments   View file @888ecef
@@ -35,13 +35,9 @@ dependency "rugged" @@ -35,13 +35,9 @@ dependency "rugged"
35 35
36 source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git" 36 source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git"
37 37
38 -env = {  
39 - "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
40 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
41 - "LD_RUN_PATH" => "#{install_dir}/embedded/lib",  
42 -}  
43 -  
44 build do 38 build do
  39 + env = with_standard_compiler_flags(with_embedded_path)
  40 +
45 # GitLab assumes it can extract the Git revision of the currently version 41 # GitLab assumes it can extract the Git revision of the currently version
46 # from the Git repo the code lives in at boot. Because of our rsync later on, 42 # from the Git repo the code lives in at boot. Because of our rsync later on,
47 # this assumption does not hold. The sed command below patches the GitLab 43 # this assumption does not hold. The sed command below patches the GitLab
config/software/libicu.rb
  Diff comments   View file @888ecef
@@ -24,13 +24,9 @@ source :url => "http://download.icu-project.org/files/icu4c/52.1/icu4c-52_1-src. @@ -24,13 +24,9 @@ source :url => "http://download.icu-project.org/files/icu4c/52.1/icu4c-52_1-src.
24 24
25 relative_path 'icu/source' 25 relative_path 'icu/source'
26 26
27 -env = {  
28 - "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
29 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
30 - "LD_RUN_PATH" => "#{install_dir}/embedded/lib"  
31 -}  
32 -  
33 build do 27 build do
  28 + env = with_standard_compiler_flags(with_embedded_path)
  29 +
34 command ["./runConfigureICU", 30 command ["./runConfigureICU",
35 "Linux/gcc", 31 "Linux/gcc",
36 "--prefix=#{install_dir}/embedded", 32 "--prefix=#{install_dir}/embedded",
config/software/mysql-client.rb
  Diff comments   View file @888ecef
@@ -27,14 +27,11 @@ source :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.g @@ -27,14 +27,11 @@ source :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.g
27 27
28 relative_path "mysql-#{version}" 28 relative_path "mysql-#{version}"
29 29
30 -env = {  
31 - "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",  
32 - "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", 30 +env = with_standard_compiler_flags(with_embedded_path)
  31 +env.merge!(
33 "CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", 32 "CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
34 "CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", 33 "CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
35 - "LD_RUN_PATH" => "#{install_dir}/embedded/lib",  
36 - "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",  
37 -} 34 +)
38 35
39 # Force CentOS-5 to use gcc/g++ v4.4 36 # Force CentOS-5 to use gcc/g++ v4.4
40 if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/ 37 if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
config/software/python-docutils.rb
  Diff comments   View file @888ecef
@@ -24,5 +24,6 @@ dependency "pip" @@ -24,5 +24,6 @@ dependency "pip"
24 dependency "python" 24 dependency "python"
25 25
26 build do 26 build do
27 - command "#{install_dir}/embedded/bin/pip install docutils==#{version}" 27 + env = with_standard_compiler_flags(with_embedded_path)
  28 + command "#{install_dir}/embedded/bin/pip install docutils==#{version}", env: env
28 end 29 end
config/software/remote-syslog.rb
  Diff comments   View file @888ecef
@@ -23,5 +23,6 @@ dependency "ruby" @@ -23,5 +23,6 @@ dependency "ruby"
23 dependency "rubygems" 23 dependency "rubygems"
24 24
25 build do 25 build do
26 - gem "install remote_syslog -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}" 26 + env = with_standard_compiler_flags(with_embedded_path)
  27 + gem "install remote_syslog -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}", env: env
27 end 28 end