diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index e1557a4468d..a401e83d365 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -75,7 +75,8 @@ ENV EXTRA_CMAKE_FLAGS=${EXTRA_CMAKE_FLAGS} # We do not want word splitting for EXTRA_CMAKE_FLAGS in case multiple are defined # hadolint ignore=SC2086 RUN [ -n "${WAMR_BUILD_TARGET:-}" ] && EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DWAMR_BUILD_TARGET=$WAMR_BUILD_TARGET"; \ - cmake -DFLB_RELEASE=On \ + cmake -DFLB_SIMD=On \ + -DFLB_RELEASE=On \ -DFLB_JEMALLOC=On \ -DFLB_TLS=On \ -DFLB_SHARED_LIB=Off \ diff --git a/dockerfiles/Dockerfile.centos7 b/dockerfiles/Dockerfile.centos7 index fd644ff2523..25660b5320b 100644 --- a/dockerfiles/Dockerfile.centos7 +++ b/dockerfiles/Dockerfile.centos7 @@ -29,7 +29,7 @@ COPY . /src/ WORKDIR /src/build RUN cmake -DCMAKE_INSTALL_PREFIX=/opt/fluent-bit/ -DCMAKE_INSTALL_SYSCONFDIR=/etc/ \ - -DFLB_RELEASE=On -DFLB_TRACE=On \ + -DFLB_SIMD=On -DFLB_RELEASE=On -DFLB_TRACE=On \ -DFLB_TESTS_INTERNAL=On -DFLB_TESTS_RUNTIME=On \ -DFLB_SQLDB=On -DFLB_HTTP_SERVER=On \ -DFLB_KAFKA=off \ diff --git a/dockerfiles/Dockerfile.windows b/dockerfiles/Dockerfile.windows index 814958187d1..1981cf3467c 100644 --- a/dockerfiles/Dockerfile.windows +++ b/dockerfiles/Dockerfile.windows @@ -159,6 +159,7 @@ RUN call "%MSVS_HOME%\VC\Auxiliary\Build\vcvars64.bat" && ` cmake -G "NMake Makefiles" ` -DOPENSSL_ROOT_DIR='C:\dev\vcpkg\packages\openssl_x64-windows-static' ` -DFLB_LIBYAML_DIR='C:\dev\vcpkg\packages\libyaml_x64-windows-static' ` + -DFLB_SIMD=On ` -DCMAKE_BUILD_TYPE=Release ` -DFLB_SHARED_LIB=Off ` -DFLB_EXAMPLES=Off ` diff --git a/packaging/distros/almalinux/Dockerfile b/packaging/distros/almalinux/Dockerfile index 93e706025a6..9fb012f32fe 100644 --- a/packaging/distros/almalinux/Dockerfile +++ b/packaging/distros/almalinux/Dockerfile @@ -95,6 +95,7 @@ WORKDIR /source/fluent-bit/build/ ARG CFLAGS ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -108,6 +109,7 @@ ARG FLB_OUT_PGSQL=On RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/amazonlinux/Dockerfile b/packaging/distros/amazonlinux/Dockerfile index 6401cd8d94a..10cad2e0ec7 100644 --- a/packaging/distros/amazonlinux/Dockerfile +++ b/packaging/distros/amazonlinux/Dockerfile @@ -130,6 +130,7 @@ WORKDIR /tmp/fluent-bit/build/ # ARG CFLAGS ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -141,6 +142,7 @@ ARG FLB_CHUNK_TRACE=On RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/centos/Dockerfile b/packaging/distros/centos/Dockerfile index 8a5c7bf0cdf..a7ec44eee5f 100644 --- a/packaging/distros/centos/Dockerfile +++ b/packaging/distros/centos/Dockerfile @@ -242,6 +242,7 @@ WORKDIR /tmp/fluent-bit/build/ ARG CFLAGS ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -252,6 +253,7 @@ ARG FLB_CHUNK_TRACE=On RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/debian/Dockerfile b/packaging/distros/debian/Dockerfile index 7da29a80bf4..d5c68620b9b 100644 --- a/packaging/distros/debian/Dockerfile +++ b/packaging/distros/debian/Dockerfile @@ -175,6 +175,7 @@ WORKDIR /tmp/fluent-bit/build/ ARG CFLAGS="-std=gnu99" ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -187,6 +188,7 @@ ARG FLB_CHUNK_TRACE=On ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/raspbian/Dockerfile b/packaging/distros/raspbian/Dockerfile index 646e1f56e19..10dd6627258 100644 --- a/packaging/distros/raspbian/Dockerfile +++ b/packaging/distros/raspbian/Dockerfile @@ -63,6 +63,7 @@ WORKDIR /tmp/fluent-bit/build/ ARG CFLAGS="-std=gnu99" ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -77,6 +78,7 @@ ARG WAMR_BUILD_TARGET=ARMV7A ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/rockylinux/Dockerfile b/packaging/distros/rockylinux/Dockerfile index 2926efc5c35..27f30529e28 100644 --- a/packaging/distros/rockylinux/Dockerfile +++ b/packaging/distros/rockylinux/Dockerfile @@ -95,6 +95,7 @@ WORKDIR /source/fluent-bit/build/ ARG CFLAGS ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -108,6 +109,7 @@ ARG FLB_OUT_PGSQL=On RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \ diff --git a/packaging/distros/ubuntu/Dockerfile b/packaging/distros/ubuntu/Dockerfile index f343ff177c0..42e1c5d2bda 100644 --- a/packaging/distros/ubuntu/Dockerfile +++ b/packaging/distros/ubuntu/Dockerfile @@ -273,6 +273,7 @@ WORKDIR /tmp/fluent-bit/build/ ARG CFLAGS="-std=gnu99" ARG CMAKE_INSTALL_PREFIX=/opt/fluent-bit/ ARG CMAKE_INSTALL_SYSCONFDIR=/etc/ +ARG FLB_SIMD=On ARG FLB_RELEASE=On ARG FLB_TRACE=On ARG FLB_SQLDB=On @@ -285,6 +286,7 @@ ARG FLB_CHUNK_TRACE=On ENV CFLAGS=$CFLAGS RUN cmake -DCMAKE_INSTALL_PREFIX="$CMAKE_INSTALL_PREFIX" \ -DCMAKE_INSTALL_SYSCONFDIR="$CMAKE_INSTALL_SYSCONFDIR" \ + -DFLB_SIMD="$FLB_SIMD" \ -DFLB_RELEASE="$FLB_RELEASE" \ -DFLB_TRACE="$FLB_TRACE" \ -DFLB_SQLDB="$FLB_SQLDB" \