Fix Docker image builds #558
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While trying to build a local lsquic docker image for interop testing, I noticed a few problems.
I had added a space in the cmake directive for LIBSSL_LIB_ssl which
doesn't need to be there, but both the LIBSSL_LIB_ssl and
LIBSSL_LIB_crypto macros don't need to be specified anymore as the
cmake infrastructure detects those properly, so lets just remove
them.
The http_client.c file fails to build in the docker image:
8.492 In file included from /src/lsquic/bin/http_client.c:52: 8.492 /src/lsquic/bin/../src/liblsquic/lsquic_stream.h:87:25: error: field 'shf_frame_type' has incomplete type
8.492 87 | enum hq_frame_type shf_frame_type;
8.492 | ^~~~~~~~~~~~~~
8.492 /src/lsquic/bin/../src/liblsquic/lsquic_stream.h:101:33: error: field 'hqfi_vint2_state' has incomplete type
8.492 101 | struct varint_read2_state hqfi_vint2_state;
8.492 | ^~~~~~~~~~~~~~~~
8.492 /src/lsquic/bin/../src/liblsquic/lsquic_stream.h:108:33: error: field 'hqfi_vint1_state' has incomplete type
8.492 108 | struct varint_read_state hqfi_vint1_state;
8.492 | ^~~~~~~~~~~~~~~~
8.492 /src/lsquic/bin/../src/liblsquic/lsquic_stream.h:284:5: error: unknown type name 'lsquic_sfcw_t'
8.492 284 | lsquic_sfcw_t fc;
8.492 | ^~~~~~~~~~~~~
It appears some header includes are missing from the build. It appears the last rebuild of the container was about 2 months ago, so I imagine some intervening reorganization broke this and didn't get noticed. Fix that up so the container builds properly.