From 9159263cbd3de8e3120f0fe8055e2e9b11bb739c Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 24 Jun 2014 11:23:25 +0200 Subject: [PATCH] No LD_LIBRARY_PATH for MySQL on Ubuntu 14.04 --- config/software/mysql-client.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/software/mysql-client.rb b/config/software/mysql-client.rb index 9aeeff1..508b59f 100644 --- a/config/software/mysql-client.rb +++ b/config/software/mysql-client.rb @@ -35,10 +35,15 @@ env = { "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", - "LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib", "PATH" => "#{install_dir}/embedded/bin:#{ENV['PATH']}", } +unless OHAI.platform =~ /ubuntu/ && OHAI.platform_version =~ /^14.04/ + # Perhaps we can drop LD_LIBRARY_PATH on all platforms? For now, all we know + # is that it breaks the build on Ubuntu 14.04. + env.merge!("LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib") +end + # Force CentOS-5 to use gcc/g++ v4.4 if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/ env.merge!( { -- libgit2 0.21.2