Skip to content

Commit

Permalink
fix zeek build in sensor (hopefully part 2)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmguero committed Oct 25, 2023
1 parent 12e6efa commit 1eb617e
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
12 changes: 12 additions & 0 deletions sensor-iso/config/hooks/normal/0910-sensor-build.hook.chroot
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,23 @@
export CCACHE_DIR="/var/spool/ccache"
export CCACHE_COMPRESS=1
export CMAKE_C_COMPILER="clang-14"
export CC="$CMAKE_C_COMPILER"
export CMAKE_CXX_COMPILER="clang++-14"
export CXX="$CMAKE_CXX_COMPILER"
export CXXFLAGS="-stdlib=libc++ -lc++abi"
export PYTHONDONTWRITEBYTECODE=1
export PYTHONUNBUFFERED=1

cat > /etc/environment << EOF
CMAKE_C_COMPILER="clang-14"
CC="clang-14"
CMAKE_CXX_COMPILER="clang++-14"
CXX="clang++-14"
CXXFLAGS="-stdlib=libc++ -lc++abi"
PYTHONDONTWRITEBYTECODE=1
PYTHONUNBUFFERED=1
EOF

# we'll use cURL to get release information and assets from GitHub using the GitHub API
GITHUB_API_CURL_ARGS=()
GITHUB_API_CURL_ARGS+=( -fsSL )
Expand Down
3 changes: 1 addition & 2 deletions sensor-iso/config/hooks/normal/0992-localepurge.hook.chroot
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ echo "en_US" >> /etc/locale.nopurge
echo "en_US.UTF-8" >> /etc/locale.nopurge
localepurge

cat > /etc/environment << EOF
cat >> /etc/environment << EOF
LANG=en_US.UTF-8
LC_ALL=en_US.UTF-8
PYTHONDONTWRITEBYTECODE=1
EOF

cat > /etc/locale.conf << EOF
Expand Down
2 changes: 2 additions & 0 deletions sensor-iso/zeek/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ENV TERM xterm

ENV CMAKE_C_COMPILER clang-14
ENV CMAKE_CXX_COMPILER clang++-14
ENV CC clang-14
ENV CXX clang++-14
ENV CXXFLAGS "-stdlib=libc++ -lc++abi"

RUN apt-get -q update && \
Expand Down
2 changes: 2 additions & 0 deletions sensor-iso/zeek/build-zeek-deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
export CCACHE_DIR="/var/spool/ccache"
export CCACHE_COMPRESS=1
export CMAKE_C_COMPILER="clang-14"
export CC="$CMAKE_C_COMPILER"
export CMAKE_CXX_COMPILER="clang++-14"
export CXX="$CMAKE_CXX_COMPILER"
export CXXFLAGS="-stdlib=libc++ -lc++abi"
export PYTHONDONTWRITEBYTECODE=1
export PYTHONUNBUFFERED=1
Expand Down

0 comments on commit 1eb617e

Please sign in to comment.