From 521abc5c2f438e5980b41cf17e7bdf5c3307a9ac Mon Sep 17 00:00:00 2001 From: "l.feng" <43399351+msclock@users.noreply.github.com> Date: Mon, 30 Dec 2024 23:34:52 +0800 Subject: [PATCH] [bit7z] compile option without warnings as errors (#43005) Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> --- ports/bit7z/fix_compile_options.patch | 13 +++++++++++++ ports/bit7z/portfile.cmake | 1 + ports/bit7z/vcpkg.json | 1 + versions/b-/bit7z.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ports/bit7z/fix_compile_options.patch diff --git a/ports/bit7z/fix_compile_options.patch b/ports/bit7z/fix_compile_options.patch new file mode 100644 index 0000000000..19f611a5bd --- /dev/null +++ b/ports/bit7z/fix_compile_options.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/CompilerOptions.cmake b/cmake/CompilerOptions.cmake +index 1cdb84f..fd9346f 100644 +--- a/cmake/CompilerOptions.cmake ++++ b/cmake/CompilerOptions.cmake +@@ -70,7 +70,7 @@ if( MSVC ) + endforeach() + endif() + else() +- target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Werror -Wconversion -Wsign-conversion ) ++ target_compile_options( ${LIB_TARGET} PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion ) + endif() + + # Extra warning flags for Clang diff --git a/ports/bit7z/portfile.cmake b/ports/bit7z/portfile.cmake index 294a01ae9d..3f08cdc490 100644 --- a/ports/bit7z/portfile.cmake +++ b/ports/bit7z/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix_install.patch fix_dependency.patch + fix_compile_options.patch ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/unofficial-bit7z-config.cmake.in" DESTINATION "${SOURCE_PATH}") diff --git a/ports/bit7z/vcpkg.json b/ports/bit7z/vcpkg.json index 4d6f0b5d09..d7e4438f18 100644 --- a/ports/bit7z/vcpkg.json +++ b/ports/bit7z/vcpkg.json @@ -1,6 +1,7 @@ { "name": "bit7z", "version": "4.0.9", + "port-version": 1, "description": "A C++ static library offering a clean and simple interface to the 7-zip shared libraries.", "homepage": "https://github.com/rikyoz/bit7z", "license": "MPL-2.0", diff --git a/versions/b-/bit7z.json b/versions/b-/bit7z.json index fe50bda56e..64ed7e6506 100644 --- a/versions/b-/bit7z.json +++ b/versions/b-/bit7z.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "761234aa0ad3687fccc86bf939350659f9d137d6", + "version": "4.0.9", + "port-version": 1 + }, { "git-tree": "88073b4adf36aa5b939b9565ec299084e3162e8b", "version": "4.0.9", diff --git a/versions/baseline.json b/versions/baseline.json index ce46822449..1e2176c66c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -658,7 +658,7 @@ }, "bit7z": { "baseline": "4.0.9", - "port-version": 0 + "port-version": 1 }, "bitmagic": { "baseline": "7.13.4",