Skip to content

Commit 9cc2ff5

Browse files
cosmo0920edsiper
authored andcommitted
build: lib: onigmo: Bundle the patched fluent/onigmo
Also, this update bumps up Unicode version to 12.0. Signed-off-by: Hiroshi Hatake <hatake@calyptia.com>
1 parent f38dd46 commit 9cc2ff5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+15903
-8797
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*~
66
_book/
77
lib/jemalloc
8-
lib/onigmo
98
tests/internal/flb_tests_internal.h
109
tests/runtime/flb_tests_runtime.h
1110
build/*

CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,11 +885,21 @@ if(FLB_IN_KAFKA OR FLB_OUT_KAFKA)
885885
add_subdirectory(${FLB_PATH_LIB_RDKAFKA} EXCLUDE_FROM_ALL)
886886
endif()
887887

888-
# Onigmo (Regex Engine)
888+
# Onigmo (Regex Engine) options
889889
# =====================
890890
if(FLB_REGEX)
891-
include(cmake/onigmo.cmake)
891+
option(ONIGMO_SHARED_LIB OFF)
892+
option(ONIGMO_CTESTS OFF)
893+
option(ONIGMO_CTESTS_SAMPLE OFF)
894+
option(ONIGMO_PYTHON_TESTS OFF)
892895
FLB_DEFINITION(FLB_HAVE_REGEX)
896+
897+
if (FLB_SYSTEM_WINDOWS)
898+
# We need this line in order to link libonigmo.lib statically.
899+
# Read onigmo/README for details.
900+
FLB_DEFINITION_VAL(ONIG_EXTERN "extern")
901+
endif()
902+
add_subdirectory(${FLB_PATH_LIB_ONIGMO} EXCLUDE_FROM_ALL)
893903
endif()
894904

895905
# tutf8e (UTF8 Encoding)

cmake/onigmo.cmake

Lines changed: 0 additions & 79 deletions
This file was deleted.

lib/onigmo/AUTHORS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
kentkt AT csc DOT jp (K.Takata)
2-
sndgk393 AT ybb DOT ne DOT jp (K.Kosako)
2+
<kkosako0@gmail.com> (K.Kosako)

0 commit comments

Comments
 (0)