Navigation Menu

Skip to content

Commit

Permalink
Check sys/sysmacros.h for mruby-file-stat
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Jun 22, 2018
1 parent 127ec23 commit 5c8c764
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Expand Up @@ -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")
Expand Down
6 changes: 6 additions & 0 deletions configure.ac
Expand Up @@ -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],
Expand Down
7 changes: 6 additions & 1 deletion vendor/mruby/CMakeLists.txt
Expand Up @@ -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}
Expand Down
5 changes: 5 additions & 0 deletions vendor/mruby/Makefile.am
Expand Up @@ -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

Expand Down

0 comments on commit 5c8c764

Please sign in to comment.