Download as
Browse Code »

Commit f6b74155d684eddb3d49ae3c452da4417083c1b8

Authored by Jacob Vosmaer
1 parent 1575184c
Exists in master and in 13 other branches 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

Run `make install` three times to build mysql

Showing 1 changed file with 4 additions and 3 deletions   Show diff stats
config/software/mysql-client.rb
  Diff comments   View file @f6b7415
@@ -60,9 +60,10 @@ build do @@ -60,9 +60,10 @@ build do
60 "-DZLIB_INCLUDE_DIR:PATH=#{install_dir}/embedded/include", 60 "-DZLIB_INCLUDE_DIR:PATH=#{install_dir}/embedded/include",
61 "-DZLIB_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libz.so", 61 "-DZLIB_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libz.so",
62 "-DCRYPTO_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libcrypto.so", 62 "-DCRYPTO_LIBRARY:FILEPATH=#{install_dir}/embedded/lib/libcrypto.so",
63 - "-DWITHOUT_SERVER=YES",  
64 ".", 63 ".",
65 ].join(" "), :env => env 64 ].join(" "), :env => env
66 - command "make -j #{max_build_jobs}", :env => env  
67 - command "make install", :env => env 65 +
  66 + %w{libmysql client include}.each do |target|
  67 + command "make -j #{max_build_jobs} install", :env => env, :cwd => "#{project_dir}/#{target}"
  68 + end
68 end 69 end