No LD_LIBRARY_PATH for MySQL on Ubuntu 14.04

Jacob Vosmaer
1 parent dba9d5a0
Showing 1 changed file with 6 additions and 1 deletions Show diff stats
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!( {
...	...	@@ -35,10 +35,15 @@ env = {
35	35	"CXXFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
36	36	"CPPFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include",
37	37	"LD_RUN_PATH" => "#{install_dir}/embedded/lib",
38		- "LD_LIBRARY_PATH" => "#{install_dir}/embedded/lib",
39	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	47	# Force CentOS-5 to use gcc/g++ v4.4
43	48	if OHAI.platform =~ /centos/ and OHAI.platform_version =~ /^5/
44	49	env.merge!( {
...	...