Merge branch 'master' into patch-1

google · Jan 22, 2025 · 5a30723 · 5a30723
2 parents a57dde6 + c2334e1
commit 5a30723
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/projects/apache-doris/project.yaml b/projects/apache-doris/project.yaml
@@ -0,0 +1,4 @@
+homepage: "https://doris.apache.org"
+language: c++
+primary_contact: "[email protected]"
+main_repo: "https://github.com/apache/doris.git"
diff --git a/projects/exiv2/build.sh b/projects/exiv2/build.sh
@@ -21,7 +21,7 @@ CXXFLAGS="${CXXFLAGS} -fno-sanitize=float-divide-by-zero"
 # Build Exiv2
 mkdir -p build
 cd build
-cmake -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DEXIV2_BUILD_FUZZ_TESTS=ON -DEXIV2_TEAM_OSS_FUZZ=ON -DLIB_FUZZING_ENGINE="${LIB_FUZZING_ENGINE}" -DEXIV2_ENABLE_INIH=OFF ..
+cmake -DEXIV2_ENABLE_PNG=ON -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_BMFF=ON -DEXIV2_TEAM_WARNINGS_AS_ERRORS=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DEXIV2_BUILD_FUZZ_TESTS=ON -DEXIV2_TEAM_OSS_FUZZ=ON -DLIB_FUZZING_ENGINE="${LIB_FUZZING_ENGINE}" -DEXIV2_ENABLE_INIH=OFF -DCMAKE_CXX_STANDARD=20 ..
 make -j $(nproc)
 
 # Copy binary and dictionary to $OUT