Commit 888ecef6 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Use standard omnibus-ruby build environments

parent bdd23b71
......@@ -28,13 +28,9 @@ source :url => "https://www.kernel.org/pub/software/scm/git/git-#{version}.tar.g
relative_path "git-#{version}"
env = {
"LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"LD_RUN_PATH" => "#{install_dir}/embedded/lib",
}
build do
env = with_standard_compiler_flags(with_embedded_path)
command ["./configure",
"--prefix=#{install_dir}/embedded",
"--with-curl=#{install_dir}/embedded",
......
......@@ -35,13 +35,9 @@ dependency "rugged"
source :git => "https://gitlab.com/gitlab-org/gitlab-ce.git"
env = {
"LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"LD_RUN_PATH" => "#{install_dir}/embedded/lib",
}
build do
env = with_standard_compiler_flags(with_embedded_path)
# GitLab assumes it can extract the Git revision of the currently version
# from the Git repo the code lives in at boot. Because of our rsync later on,
# this assumption does not hold. The sed command below patches the GitLab
......
......@@ -24,13 +24,9 @@ source :url => "http://download.icu-project.org/files/icu4c/52.1/icu4c-52_1-src.
relative_path 'icu/source'
env = {
"LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"LD_RUN_PATH" => "#{install_dir}/embedded/lib"
}
build do
env = with_standard_compiler_flags(with_embedded_path)
command ["./runConfigureICU",
"Linux/gcc",
"--prefix=#{install_dir}/embedded",
......
......@@ -27,14 +27,11 @@ source :url => "http://dev.mysql.com/get/Downloads/MySQL-5.5/mysql-5.5.37.tar.g
relative_path "mysql-#{version}"
env = {
"LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
env = with_standard_compiler_flags(with_embedded_path)
env.merge!(
"CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
"LD_RUN_PATH" => "#{install_dir}/embedded/lib",
"PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}",
}
)
# Force CentOS-5 to use gcc/g++ v4.4
if Ohai['platform'] =~ /centos/ and Ohai['platform_version'] =~ /^5/
......
......@@ -24,5 +24,6 @@ dependency "pip"
dependency "python"
build do
command "#{install_dir}/embedded/bin/pip install docutils==#{version}"
env = with_standard_compiler_flags(with_embedded_path)
command "#{install_dir}/embedded/bin/pip install docutils==#{version}", env: env
end
......@@ -23,5 +23,6 @@ dependency "ruby"
dependency "rubygems"
build do
gem "install remote_syslog -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}"
env = with_standard_compiler_flags(with_embedded_path)
gem "install remote_syslog -n #{install_dir}/embedded/bin --no-rdoc --no-ri -v #{version}", env: env
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment