[Groonga-commit] groonga/heroku-buildpack-groonga at 35594c9 [master] Fix prefix in LD_LIBRARY_PATH

Back to archive index

Kouhei Sutou null+****@clear*****
Tue Feb 23 00:24:51 JST 2016


Kouhei Sutou	2016-02-23 00:24:51 +0900 (Tue, 23 Feb 2016)

  New Revision: 35594c9a5854e82d419f013a79655589f587665d
  https://github.com/groonga/heroku-buildpack-groonga/commit/35594c9a5854e82d419f013a79655589f587665d

  Message:
    Fix prefix in LD_LIBRARY_PATH

  Modified files:
    bin/compile

  Modified: bin/compile (+9 -2)
===================================================================
--- bin/compile    2016-02-23 00:24:41 +0900 (77be370)
+++ bin/compile    2016-02-23 00:24:51 +0900 (3b58885)
@@ -120,9 +120,12 @@ Dir.chdir(build_dir) do
   base_ld_library_paths = [
     environment_variables["LD_LIBRARY_PATH"],
     ENV["LD_LIBRARY_PATH"],
+  ]
+  ld_library_paths = [
+    lib_dir,
     "#{build_dir}/vendor/mecab/lib",
   ]
-  ld_library_paths = [lib_dir] + base_ld_library_paths
+  ld_library_paths += base_ld_library_paths
   ENV["LD_LIBRARY_PATH"] = build_path_environment_value(ld_library_paths)
   ENV["GRN_PLUGINS_DIR"] = "#{absolete_prefix}/lib/groonga/plugins"
   ENV["GRN_RUBY_SCRIPTS_DIR"] = "#{absolete_prefix}/lib/groonga/scripts/ruby"
@@ -155,7 +158,11 @@ Dir.chdir(build_dir) do
   profile_dir="#{build_dir}/.profile.d"
   FileUtils.mkdir_p(profile_dir)
   File.open("#{profile_dir}/groonga.sh", "w") do |env_file|
-    ld_library_paths = ["#{app_dir}/#{prefix}/lib"] + base_ld_library_paths
+    ld_library_paths = [
+      "#{app_dir}/#{prefix}/lib",
+      "#{app_dir}/vendor/mecab/lib",
+    ]
+    ld_library_paths += base_ld_library_paths
     ld_library_path = build_path_environment_value(ld_library_paths)
     env_file.puts("export LD_LIBRARY_PATH=#{ld_library_path}")
   end
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index