Kouhei Sutou
null+****@clear*****
Fri Jun 22 10:52:11 JST 2018
Kouhei Sutou 2018-06-22 10:52:11 +0900 (Fri, 22 Jun 2018) New Revision: 5c8c7645d35b52bbcf3e9570157f939c3c85dfd5 https://github.com/groonga/groonga/commit/5c8c7645d35b52bbcf3e9570157f939c3c85dfd5 Message: Check sys/sysmacros.h for mruby-file-stat Modified files: CMakeLists.txt configure.ac vendor/mruby/CMakeLists.txt vendor/mruby/Makefile.am Modified: CMakeLists.txt (+3 -0) =================================================================== --- CMakeLists.txt 2018-06-22 10:39:23 +0900 (5d95fd1ad) +++ CMakeLists.txt 2018-06-22 10:52:11 +0900 (20a20f8ac) @@ -635,6 +635,9 @@ else() endif() set(MRUBY_DEFINITIONS "MRB_INT64" "HAVE_ONIGMO_H") +# For mruby-file-stat +ac_check_headers(sys/sysmacros.h) + # TODO: Support using system Onigmo instead of bundled Onigmo. set(GRN_WITH_ONIGMO ON) set(ONIGMO_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/vendor/onigmo-source") Modified: configure.ac (+6 -0) =================================================================== --- configure.ac 2018-06-22 10:39:23 +0900 (4d2026a58) +++ configure.ac 2018-06-22 10:52:11 +0900 (dcdbaf982) @@ -1569,6 +1569,12 @@ AM_CONDITIONAL(WITH_MRUBY, test "$enable_mruby" = "yes") MRUBY_CPPFLAGS="-DMRB_INT64" AC_SUBST(MRUBY_CPPFLAGS) +# For mruby-file-stat +AC_CHECK_HEADERS(sys/sysmacros.h, + [HAVE_SYS_SYSMACROS_H=yes], + [HAVE_SYS_SYSMACROS_H=no]) +AM_CONDITIONAL(HAVE_SYS_SYSMACROS_H, test "$HAVE_SYS_SYSMACROS_H" = "yes") + # This option is used in vendor/onigmo/configure AC_ARG_ENABLE(shared-onigmo, [AS_HELP_STRING([--enable-shared-onigmo], Modified: vendor/mruby/CMakeLists.txt (+6 -1) =================================================================== --- vendor/mruby/CMakeLists.txt 2018-06-22 10:39:23 +0900 (e9232f858) +++ vendor/mruby/CMakeLists.txt 2018-06-22 10:52:11 +0900 (f2140534c) @@ -60,9 +60,14 @@ if(GRN_WITH_MRUBY) string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_BINARY_DIR}/\\1" MRUBY_BUILT_SOURCES "${MRUBY_BUILT_SOURCES}") endif() + if(HAVE_SYS_SYSMACROS_H) + set(MRUBY_FILE_STAT_CONFIG_H_CONTENT "#define HAVE_SYS_SYSMACROS_H 1") + else() + set(MRUBY_FILE_STAT_CONFIG_H_CONTENT "") + endif() file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mruby-file-stat/src/config.h" - "") + "${MRUBY_FILE_STAT_CONFIG_H_CONTENT}") set(MRUBY_ALL_SOURCES ${MRUBY_SOURCES} Modified: vendor/mruby/Makefile.am (+5 -0) =================================================================== --- vendor/mruby/Makefile.am 2018-06-22 10:39:23 +0900 (a08df3cd8) +++ vendor/mruby/Makefile.am 2018-06-22 10:52:11 +0900 (34eb23d7e) @@ -46,8 +46,13 @@ mruby-compiler/core/parse.c: mruby_build.timestamp mruby-onig-regexp/src/mruby_onig_regexp.c: mruby_build.timestamp mruby-env/src/env.c: mruby_build.timestamp mruby-file-stat/src/file-stat.c: mruby_build.timestamp +if HAVE_SYS_SYSMACROS_H +mruby-file-stat/src/config.h: mruby_build.timestamp + echo "#define HAVE_SYS_SYSMACROS_H 1" > "$(builddir)/$@" +else mruby-file-stat/src/config.h: mruby_build.timestamp touch "$(builddir)/$@" +endif mruby-dir/src/dir.c: mruby_build.timestamp mruby-dir/src/Win/dirent.c: mruby_build.timestamp -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20180622/0f26caa7/attachment-0001.htm
