Skip to content

Commit

Permalink
Fix build on Win, Alpine, Fedora and CentOS 9
Browse files Browse the repository at this point in the history
  • Loading branch information
Neverlord committed May 6, 2024
1 parent f326f36 commit 8a35d58
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
9 changes: 6 additions & 3 deletions ZeekBundle.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ function(ZeekBundle_Build name srcDir binDir)
ERROR_FILE "${binDir}/cmake.err"
RESULT_VARIABLE cmakeResult)
if (NOT cmakeResult EQUAL 0)
message(FATAL_ERROR "Failed to configure external project: ${srcDir}!\nSee ${binDir}/cmake.out and ${binDir}/cmake.err for details.")
file(READ "${binDir}/cmake.err" cmakeErr)
message(FATAL_ERROR "Failed to configure external project ${name}:\n\n${cmakeErr}")
endif ()
# Build the external project.
message(STATUS "Building bundled project: ${name}")
Expand All @@ -57,7 +58,8 @@ function(ZeekBundle_Build name srcDir binDir)
ERROR_FILE "${binDir}/build.err"
RESULT_VARIABLE buildResult)
if (NOT buildResult EQUAL 0)
message(FATAL_ERROR "Failed to build external project: ${srcDir}!\nSee ${binDir}/build.out and ${binDir}/build.err for details.")
file(READ "${binDir}/build.err" cmakeErr)
message(FATAL_ERROR "Failed to configure external project ${name}:\n\n${cmakeErr}")
endif ()
# Install the external project.
message(STATUS "Installing bundled project: ${name}")
Expand All @@ -71,7 +73,8 @@ function(ZeekBundle_Build name srcDir binDir)
ERROR_FILE "${binDir}/install.err"
RESULT_VARIABLE installResult)
if (NOT installResult EQUAL 0)
message(FATAL_ERROR "Failed to install external project: ${srcDir}!\nSee ${binDir}/install.out and ${binDir}/install.err for details.")
file(READ "${binDir}/install.err" cmakeErr)
message(FATAL_ERROR "Failed to configure external project ${name}:\n\n${cmakeErr}")
endif ()
endfunction ()

Expand Down
3 changes: 2 additions & 1 deletion ci/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ RUN apk add --no-cache \
py3-pip \
py3-websockets \
python3 \
python3-dev
python3-dev \
zlib-dev

RUN pip3 install --break-system-packages junit2html
1 change: 1 addition & 0 deletions ci/centos-stream-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ RUN dnf -y install \
openssl-devel \
python3 \
python3-devel \
zlib-devel \
&& dnf clean all && rm -rf /var/cache/dnf
1 change: 1 addition & 0 deletions ci/fedora-38/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ RUN dnf -y install \
openssl-devel \
python3 \
python3-devel \
zlib-devel \
&& dnf clean all && rm -rf /var/cache/dnf
1 change: 1 addition & 0 deletions ci/fedora-39/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ RUN dnf -y install \
openssl-devel \
python3 \
python3-devel \
zlib-devel \
&& dnf clean all && rm -rf /var/cache/dnf
3 changes: 2 additions & 1 deletion ci/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ RUN choco install -y --no-progress visualstudio2022-workload-vctools
RUN choco install -y --no-progress openssl --version=3.1.1
RUN choco install -y --no-progress python --version=3.10.0
RUN choco install -y --no-progress msysgit
RUN choco install -y --no-progress zstandard

# Add git to the global PATH
SHELL [ "cmd", "/c" ]
RUN setx /M PATH "%PATH%;C:\\Program Files\\Git\\bin"
RUN setx /M PATH "%PATH%;C:\\Program Files\\Git\\bin"

0 comments on commit 8a35d58

Please sign in to comment.