Commit 3364269c02d71217dd577e1f7423e4062a32dcc3
Exists in
master
and in
4 other branches
Merge branch 'mysql_ubuntu_1404' into 'master'
Fix MySQL build for Ubuntu 14.04
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
config/software/mysql-client.rb
| @@ -35,10 +35,15 @@ env = { | @@ -35,10 +35,15 @@ env = { | ||
| 35 | "CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", | 35 | "CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", |
| 36 | "CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", | 36 | "CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", |
| 37 | "LD_RUN_PATH" => "#{install_dir}/embedded/lib", | 37 | "LD_RUN_PATH" => "#{install_dir}/embedded/lib", |
| 38 | - "LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib", | ||
| 39 | "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}", | 38 | "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}", |
| 40 | } | 39 | } |
| 41 | 40 | ||
| 41 | +unless OHAI.platform =~ /ubuntu/ && OHAI.platform_version =~ /^14.04/ | ||
| 42 | + # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know | ||
| 43 | + # is that it breaks the build on Ubuntu 14.04. | ||
| 44 | + env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib") | ||
| 45 | +end | ||
| 46 | + | ||
| 42 | # Force CentOS-5 to use gcc/g++ v4.4 | 47 | # Force CentOS-5 to use gcc/g++ v4.4 |
| 43 | if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/ | 48 | if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/ |
| 44 | env.merge!( { | 49 | env.merge!( { |