Download as
Browse Code »

Commit 22c45c12d000d56aee559b0b2e69da7780cbefe3

Authored by Jacob Vosmaer
2 parents 1ed69564 4e3ff9f2
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'git' into 'master' 

Git
Showing 2 changed files with 43 additions and 0 deletions   Show diff stats
config/projects/gitlab.rb
  Diff comments   View file @22c45c1
... ... @@ -28,6 +28,7 @@ build_iteration 1
28 28 # creates required build directories
29 29 dependency "preparation"
30 30  
  31 +dependency "git"
31 32 dependency "gitlab-shell"
32 33 dependency "gitlab-webui"
33 34 dependency "chef-gem"
... ...
config/software/git.rb 0 → 100644
  Diff comments   View file @22c45c1
... ... @@ -0,0 +1,42 @@
  1 +name "git"
  2 +version "1.8.5.3"
  3 +
  4 +dependency "zlib"
  5 +dependency "openssl"
  6 +dependency "curl"
  7 +
  8 +source :url => "https://git-core.googlecode.com/files/git-1.8.5.3.tar.gz",
  9 + :md5 => "57b966065882f83ef5879620a1e329ca"
  10 +
  11 +relative_path 'git-1.8.5.3'
  12 +
  13 +env = {
  14 + "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
  15 + "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
  16 + "LD_RUN_PATH" => "#{install_dir}/embedded/lib",
  17 +}
  18 +
  19 +build do
  20 + command ["./configure",
  21 + "--prefix=#{install_dir}/embedded",
  22 + "--with-curl=#{install_dir}/embedded",
  23 + "--with-ssl=#{install_dir}/embedded",
  24 + "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env
  25 +
  26 + # Ugly hack because ./configure does not pick these up from the env
  27 + block do
  28 + open(File.join(project_dir, "config.mak.autogen"), "a") do |file|
  29 + file.print <<-EOH
  30 +# Added by Omnibus git software definition git.rb
  31 +NO_PERL=YesPlease
  32 +NO_EXPAT=YesPlease
  33 +NO_TCLTK=YesPlease
  34 +NO_GETTEXT=YesPlease
  35 +NO_PYTHON=YesPlease
  36 + EOH
  37 + end
  38 + end
  39 +
  40 + command "make -j #{max_build_jobs}", :env => env
  41 + command "make install"
  42 +end
... ...