From d7e8ae72bb769453bc0e81c954fe87ea8836c7e5 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 14 Aug 2014 14:35:23 +0200 Subject: [PATCH] Remove LD_LIBRARY_PATH variable that nobody needs --- config/software/mysql-client.rb | 6 ------ 1 file changed, 0 insertions(+), 6 deletions(-) diff --git a/config/software/mysql-client.rb b/config/software/mysql-client.rb index f2adaa2..e092cd5 100644 --- a/config/software/mysql-client.rb +++ b/config/software/mysql-client.rb @@ -36,12 +36,6 @@ env = { "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