From a94dff85e795b6829b5430202827bc73f32c9402 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Tue, 20 Aug 2024 13:58:47 +0300 Subject: [PATCH 1/3] cfl: disable building protobuf library The patch disables building protobuf library, this will speed up overall build time significantly. --- .clusterfuzzlite/Dockerfile | 3 ++- .clusterfuzzlite/build.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile index 1061003e..ecda1f66 100644 --- a/.clusterfuzzlite/Dockerfile +++ b/.clusterfuzzlite/Dockerfile @@ -8,7 +8,8 @@ FROM gcr.io/oss-fuzz-base/base-builder:v1 RUN apt-get update && apt-get install -y \ build-essential ninja-build cmake make \ - libreadline-dev libunwind-dev zlib1g-dev + libreadline-dev libunwind-dev zlib1g-dev \ + protobuf-compiler libprotobuf-dev COPY . $SRC/lua-c-api-tests WORKDIR $SRC/lua-c-api-tests diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh index a9e930bb..8be75585 100755 --- a/.clusterfuzzlite/build.sh +++ b/.clusterfuzzlite/build.sh @@ -29,6 +29,7 @@ esac cmake_args=( -DUSE_LUAJIT=ON -DOSS_FUZZ=ON + -DENABLE_BUILD_PROTOBUF=OFF $SANITIZERS_ARGS # C compiler From 968a465237761b0ce21e5fd9da0df11c5299d1b6 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Tue, 20 Aug 2024 16:12:36 +0300 Subject: [PATCH 2/3] disable ninja [WIP] --- .clusterfuzzlite/Dockerfile | 2 +- .clusterfuzzlite/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile index ecda1f66..4bae02f6 100644 --- a/.clusterfuzzlite/Dockerfile +++ b/.clusterfuzzlite/Dockerfile @@ -7,7 +7,7 @@ FROM gcr.io/oss-fuzz-base/base-builder:v1 RUN apt-get update && apt-get install -y \ - build-essential ninja-build cmake make \ + build-essential cmake make \ libreadline-dev libunwind-dev zlib1g-dev \ protobuf-compiler libprotobuf-dev diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh index 8be75585..db692494 100755 --- a/.clusterfuzzlite/build.sh +++ b/.clusterfuzzlite/build.sh @@ -52,7 +52,7 @@ git config --global --add safe.directory '*' # Build the project and fuzzers. [[ -e build ]] && rm -rf build -cmake "${cmake_args[@]}" -S . -B build -G Ninja +cmake "${cmake_args[@]}" -S . -B build cmake --build build --parallel cp corpus/*.dict corpus/*.options $OUT/ From 9396030da5e68c9a2d13217123f7dcd08a769027 Mon Sep 17 00:00:00 2001 From: Sergey Bronnikov Date: Wed, 11 Dec 2024 10:59:34 +0300 Subject: [PATCH 3/3] Revert "disable ninja [WIP]" This reverts commit 968a465237761b0ce21e5fd9da0df11c5299d1b6. --- .clusterfuzzlite/Dockerfile | 2 +- .clusterfuzzlite/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile index 4bae02f6..ecda1f66 100644 --- a/.clusterfuzzlite/Dockerfile +++ b/.clusterfuzzlite/Dockerfile @@ -7,7 +7,7 @@ FROM gcr.io/oss-fuzz-base/base-builder:v1 RUN apt-get update && apt-get install -y \ - build-essential cmake make \ + build-essential ninja-build cmake make \ libreadline-dev libunwind-dev zlib1g-dev \ protobuf-compiler libprotobuf-dev diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh index db692494..8be75585 100755 --- a/.clusterfuzzlite/build.sh +++ b/.clusterfuzzlite/build.sh @@ -52,7 +52,7 @@ git config --global --add safe.directory '*' # Build the project and fuzzers. [[ -e build ]] && rm -rf build -cmake "${cmake_args[@]}" -S . -B build +cmake "${cmake_args[@]}" -S . -B build -G Ninja cmake --build build --parallel cp corpus/*.dict corpus/*.options $OUT/