Kouhei Sutou
null+****@clear*****
Mon Mar 30 11:12:13 JST 2015
Kouhei Sutou 2015-03-30 11:12:13 +0900 (Mon, 30 Mar 2015) New Revision: 0630dbe14e6314945e1af01e0f951723f7bee6be https://github.com/groonga/groonga/commit/0630dbe14e6314945e1af01e0f951723f7bee6be Message: mruby: set include path for oniguruma.h Modified files: vendor/mruby/CMakeLists.txt vendor/mruby/Makefile.am vendor/mruby/build_config.rb vendor/mruby/mruby_build.rb Modified: vendor/mruby/CMakeLists.txt (+1 -0) =================================================================== --- vendor/mruby/CMakeLists.txt 2015-03-30 11:02:21 +0900 (70fde03) +++ vendor/mruby/CMakeLists.txt 2015-03-30 11:12:13 +0900 (c78fde5) @@ -45,6 +45,7 @@ if(GRN_WITH_MRUBY) "${CMAKE_CURRENT_SOURCE_DIR}/build_config.rb" "${CMAKE_CURRENT_SOURCE_DIR}/../mruby-source" "${CMAKE_CURRENT_BINARY_DIR}/../mruby-build" + "${CMAKE_CURRENT_SOURCE_DIR}/../onigmo-source" "${mruby_build_timestamp}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" RESULT_VARIABLE MRUBY_BUILD_RESULT Modified: vendor/mruby/Makefile.am (+1 -0) =================================================================== --- vendor/mruby/Makefile.am 2015-03-30 11:02:21 +0900 (c68e0e4) +++ vendor/mruby/Makefile.am 2015-03-30 11:12:13 +0900 (c0f8d7c) @@ -42,6 +42,7 @@ mruby_build.timestamp: build_config.rb "$(srcdir)/build_config.rb" \ "$(srcdir)/../mruby-source" \ "$(builddir)/../mruby-build" \ + "$(srcdir)/../onigmo-source" \ "mruby_build.timestamp" CLEANFILES = *.gcno *gcda Modified: vendor/mruby/build_config.rb (+5 -0) =================================================================== --- vendor/mruby/build_config.rb 2015-03-30 11:02:21 +0900 (65992c2) +++ vendor/mruby/build_config.rb 2015-03-30 11:12:13 +0900 (096163b) @@ -5,6 +5,11 @@ MRuby::Build.new do |conf| toolchain :gcc end + oniguruma_include_path = ENV["MRUBY_ONIGURUMA_INCLUDE_PATH"] + if oniguruma_include_path + conf.cc.include_paths << oniguruma_include_path + end + enable_debug conf.gem :core => "mruby-sprintf" Modified: vendor/mruby/mruby_build.rb (+5 -3) =================================================================== --- vendor/mruby/mruby_build.rb 2015-03-30 11:02:21 +0900 (8eb89a9) +++ vendor/mruby/mruby_build.rb 2015-03-30 11:12:13 +0900 (9edcb90) @@ -1,7 +1,7 @@ #!/usr/bin/env ruby -if ARGV.size != 4 - puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR MRUBY_BUILD_DIR TIMESTAMP_FILE") +if ARGV.size != 5 + puts("Usage: #{$0} BUILD_COFNIG.RB MRUBY_SOURCE_DIR MRUBY_BUILD_DIR ONIGURUMA_INCLUDE_PATH TIMESTAMP_FILE") exit(false) end @@ -11,6 +11,7 @@ require "fileutils" build_config_rb = File.expand_path(ARGV.shift) mruby_source_dir = ARGV.shift mruby_build_dir = File.expand_path(ARGV.shift) +oniguruma_include_path = File.expand_path(ARGV.shift) timestamp_file = File.expand_path(ARGV.shift) FileUtils.rm_rf(mruby_build_dir) @@ -19,7 +20,8 @@ Dir.chdir(mruby_source_dir) do unless system(RbConfig.ruby, "minirake", "MRUBY_CONFIG=#{build_config_rb}", - "MRUBY_BUILD_DIR=#{mruby_build_dir}") + "MRUBY_BUILD_DIR=#{mruby_build_dir}", + "MRUBY_ONIGURUMA_INCLUDE_PATH=#{oniguruma_include_path}") exit(false) end end -------------- next part -------------- HTML����������������������������...Download