[Groonga-commit] ranguba/rroonga at e8b8a82 [master] When cross compiling for Windows, it should not check host pkgconfig result

Back to archive index

cosmo0920 null+****@clear*****
Wed Aug 13 21:29:23 JST 2014


cosmo0920	2014-08-13 21:29:23 +0900 (Wed, 13 Aug 2014)

  New Revision: e8b8a82d709943b20803817354267ece7d52cc18
  https://github.com/ranguba/rroonga/commit/e8b8a82d709943b20803817354267ece7d52cc18

  Message:
    When cross compiling for Windows, it should not check host pkgconfig result

  Modified files:
    ext/groonga/extconf.rb

  Modified: ext/groonga/extconf.rb (+11 -1)
===================================================================
--- ext/groonga/extconf.rb    2014-08-11 16:10:22 +0900 (1d5a8ec)
+++ ext/groonga/extconf.rb    2014-08-13 21:29:23 +0900 (0d46348)
@@ -231,7 +231,7 @@ def build_groonga(major, minor, micro)
   end
 end
 
-unless PKGConfig.have_package(package_name, major, minor, micro)
+def install_local_groonga(package_name, major, minor, micro)
   unless have_local_groonga?(package_name, major, minor, micro)
     required_version = [major, minor, micro]
     if (required_version <=> LatestGroongaVersion::VERSION) < 0
@@ -247,6 +247,16 @@ unless PKGConfig.have_package(package_name, major, minor, micro)
   add_rpath_for_local_groonga
 end
 
+if win32?
+  unless have_local_groonga?(package_name, major, minor, micro)
+    install_local_groonga(package_name, major, minor, micro)
+  end
+else
+  unless PKGConfig.have_package(package_name, major, minor, micro)
+    install_local_groonga(package_name, major, minor, micro)
+  end
+end
+
 real_version = PKGConfig.modversion(package_name)
 real_major, real_minor, real_micro = real_version.split(/\./)
 
-------------- next part --------------
HTML����������������������������...
下載 



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