Skip to content

Commit 03ea160

Browse files
various projects: make compatible with llvm 21 (#13920)
ref: #13915 --------- Signed-off-by: David Korczynski <[email protected]>
1 parent 1e77a78 commit 03ea160

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

projects/assimp/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
#
1616
################################################################################
1717

18+
rm -rf contrib/googletest
19+
git clone https://github.com/google/googletest contrib/googletest
20+
1821
# generate build env and build assimp
1922
cmake CMakeLists.txt -G "Ninja" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_ZLIB=ON \
2023
-DASSIMP_BUILD_TESTS=ON -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \

projects/cpuinfo/build.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ sed -i 's/"\/proc\/cpuinfo"/"\/tmp\/libfuzzer.config"/g' src/x86/linux/cpuinfo.c
2020
sed -i 's/"\/sys\/devices\/system\/cpu\/kernel_max"/"\/tmp\/libfuzzer.config"/g' src/linux/processors.c
2121
mkdir build
2222
cd build
23-
cmake ..
23+
cmake \
24+
-DCPUINFO_BUILD_UNIT_TESTS=OFF \
25+
-DCPUINFO_BUILD_MOCK_TESTS=OFF \
26+
-DCPUINFO_BUILD_BENCHMARKS=OFF \
27+
..
2428
make
2529

2630

projects/cxxopts/build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@
1515
#
1616
################################################################################
1717

18+
export CXXFLAGS="${CXXFLAGS} -std=c++17"
1819
export USE_BAZEL_VERSION=7.4.0
1920
bazel_build_fuzz_tests

projects/opencv/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ for fuzzer in core_fuzzer filestorage_read_file_fuzzer \
3434
filestorage_read_filename_fuzzer filestorage_read_string_fuzzer \
3535
generateusergallerycollage_fuzzer imdecode_fuzzer imencode_fuzzer \
3636
imread_fuzzer readnetfromtensorflow_fuzzer; do
37-
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.cc -std=c++11 \
37+
$CXX $CXXFLAGS $LIB_FUZZING_ENGINE $fuzzer.cc -std=c++17 \
3838
-I$install_dir/include/opencv4 -L$install_dir/lib \
3939
-L$install_dir/lib/opencv4/3rdparty \
4040
-lopencv_dnn -lopencv_objdetect -lopencv_photo -lopencv_ml -lopencv_gapi \

projects/spdlog/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cmake -DSPDLOG_BUILD_TESTS=ON . && make -j$(nproc)
2121
# build fuzzers
2222
for f in $(find $SRC -name '*_fuzzer.cc'); do
2323
b=$(basename -s .cc $f)
24-
$CXX $CXXFLAGS -std=c++11 -Iinclude \
24+
$CXX $CXXFLAGS -std=c++17 -Iinclude \
2525
$f $LIB_FUZZING_ENGINE ./libspdlog.a \
2626
-o $OUT/$b
2727
done

projects/zopfli/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ make -j$(nproc) libzopfli.a
2222
# build fuzzers
2323
for fuzzers in $(find $SRC -name '*_fuzzer.cc'); do
2424
base=$(basename -s .cc $fuzzers)
25-
$CXX $CXXFLAGS -std=c++11 -I. -Isrc/zopfli \
25+
$CXX $CXXFLAGS -std=c++17 -I. -Isrc/zopfli \
2626
$fuzzers ./libzopfli.a -o $OUT/$base $LIB_FUZZING_ENGINE
2727
done

0 commit comments

Comments
 (0)