Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ccommon update #323

Merged
merged 4 commits into from
Mar 2, 2021
Merged

Ccommon update #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8aa2f3d
Squashed 'deps/ccommon/' changes from f5efe29..6af1821
Mar 2, 2021
ec614ed
take upstream change in conflict
Mar 2, 2021
092d12c
disable http target
Mar 2, 2021
9bc2d18
pin http test to http target
Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export CTEST_OUTPUT_ON_FAILURE=1

# build CDB in CI or else stuff breaks
if [[ -n "${RUST_ENABLED:-}" ]]; then
cmake_cmd+=( -DTARGET_CDB=yes -DTARGET_HTTP=yes -DHAVE_RUST=yes -DRUST_VERBOSE_BUILD=yes )
cmake_cmd+=( -DTARGET_CDB=yes -DHAVE_RUST=yes -DRUST_VERBOSE_BUILD=yes )
fi

mkdir -p _build && ( cd _build && "${cmake_cmd[@]}" .. && make && make test ) || die 'make failed'
Expand Down
3 changes: 2 additions & 1 deletion deps/ccommon/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# Automatically generated files
COPYING
INSTALL
include/config.h

# Temporary
*.swp
Expand Down Expand Up @@ -52,4 +53,4 @@ bindings.rs
Cargo.lock

# Cargo build path
target
target
2 changes: 1 addition & 1 deletion deps/ccommon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ check_function_exists(accept4 HAVE_ACCEPT4)
# this has to be set _after_ the above checks
configure_file(
"${PROJECT_SOURCE_DIR}/config.h.in"
"${PROJECT_BINARY_DIR}/config.h")
"${PROJECT_SOURCE_DIR}/include/config.h")


##########################
Expand Down
Loading