Archives/lnav
2
0
Fork 0
mirror of https://github.com/tstack/lnav synced 2024-11-15 18:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[build] try to fix some issues

Browse Source
This commit is contained in:
Timothy Stack 2024-10-24 12:05:03 -07:00
parent bc48873af1
commit e0464d01e3
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakePresets.json
View File

@ -2,7 +2,7 @@
"version": 2,
"configurePresets": [
{
"name": "default",
"name": "vcpkg",
"generator": "Ninja",
"binaryDir": "${sourceDir}/build",
"cacheVariables": {
@ -10,4 +10,4 @@
}
}
]
}
}

2
TESTS_ENVIRONMENT.in
View File

@ -75,7 +75,7 @@ export HAVE_SQLITE3_ERROR_OFFSET
LAST_TEST=""
LAST_CAP_TEST=()
LAST_CAP_TEST=""
has_errors=""

1
configure.ac
View File

@ -50,6 +50,7 @@ AM_PROG_AR
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PATH_PROG(BASH, [bash])
AC_PATH_PROG(CARGO_CMD, [cargo])
AC_PATH_PROG(BZIP2_CMD, [bzip2])
AC_PATH_PROG(RE2C_CMD, [re2c])

4
src/tailer/Makefile.am
View File

@ -1,8 +1,8 @@
include $(top_srcdir)/aminclude_static.am
TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
LOG_COMPILER = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
TESTS_ENVIRONMENT = $(BASH) $(top_builddir)/TESTS_ENVIRONMENT
LOG_COMPILER = $(BASH) $(top_builddir)/TESTS_ENVIRONMENT
BUILT_SOURCES = tailerbin.cc

2
src/yajlpp/yajlpp.cc
View File

@ -1191,7 +1191,7 @@ yajlpp_parse_context::get_path_fragment(int offset,
} else {
end = this->ypc_path.size() - 1;
}
if (this->ypc_handlers) {
if (this->ypc_handlers != nullptr) {
len_out
= json_ptr::decode(frag_in, &this->ypc_path[start], end - start);
retval = frag_in;

4
test/Makefile.am
View File

@ -1,8 +1,8 @@
include $(top_srcdir)/aminclude_static.am
TESTS_ENVIRONMENT = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
LOG_COMPILER = $(SHELL) $(top_builddir)/TESTS_ENVIRONMENT
TESTS_ENVIRONMENT = $(BASH) $(top_builddir)/TESTS_ENVIRONMENT
LOG_COMPILER = $(BASH) $(top_builddir)/TESTS_ENVIRONMENT
RM_V = $(RM_V_@AM_V@)
RM_V_ = $(RM_V_@AM_DEFAULT_V@)