Skip to content

Commit b72dbac

Browse files
authored
build(deps): sync bit7z and 7zip from vcpkg (#29)
Signed-off-by: l.feng <[email protected]>
1 parent e98be63 commit b72dbac

9 files changed

+15
-180
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/CPP/Windows/TimeUtils.cpp b/CPP/Windows/TimeUtils.cpp
2+
index bbd79ba..8df3ea3 100644
3+
--- a/CPP/Windows/TimeUtils.cpp
4+
+++ b/CPP/Windows/TimeUtils.cpp
5+
@@ -259,7 +259,7 @@ bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
6+
Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.3,
7+
Cygwin 2.9, mingw, MSVC 14, Android 9.0.
8+
*/
9+
-#if defined(TIME_UTC)
10+
+#if defined(TIME_UTC) && (!defined(__ANDROID__) || __ANDROID_API__ >= 29)
11+
#define ZIP7_USE_timespec_get
12+
// #pragma message("ZIP7_USE_timespec_get")
13+
#elif defined(CLOCK_REALTIME)

Diff for: cmake/vcpkg/ports/7zip/portfile.cmake

+2-11
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,13 @@ vcpkg_from_github(
66
REF "${VERSION}"
77
SHA512 dc0241ed96907965445550912d1171fe32230a52997b089558a4cc73a662fc6a17940db8dcb0794b805268964899d9e5a48ddb444e92b56fd243bbaa17c20a1c
88
HEAD_REF main
9+
PATCHES
10+
fix_timespec_get_broken_on_android.patch
911
)
1012

1113
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
1214
file(COPY "${CMAKE_CURRENT_LIST_DIR}/7zip-config.cmake.in" DESTINATION "${SOURCE_PATH}")
1315

14-
vcpkg_cmake_get_vars(cmake_vars_file)
15-
include("${cmake_vars_file}")
16-
17-
if(VCPKG_TARGET_IS_ANDROID)
18-
message(STATUS "Disable TIME_UTC on android")
19-
vcpkg_replace_string("${SOURCE_PATH}/CPP/Windows/TimeUtils.cpp"
20-
[[if defined(TIME_UTC)]]
21-
[[if defined(TIME_UTC) && !defined(__ANDROID__)]]
22-
)
23-
endif()
24-
2516
vcpkg_cmake_configure(
2617
SOURCE_PATH "${SOURCE_PATH}"
2718
)

Diff for: cmake/vcpkg/ports/7zip/vcpkg.json

-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
{
1515
"name": "vcpkg-cmake-config",
1616
"host": true
17-
},
18-
{
19-
"name": "vcpkg-cmake-get-vars",
20-
"host": true
2117
}
2218
]
2319
}

Diff for: cmake/vcpkg/ports/bit7z/fix_compile_options.patch

-13
This file was deleted.

Diff for: cmake/vcpkg/ports/bit7z/fix_dependency.patch

-28
This file was deleted.

Diff for: cmake/vcpkg/ports/bit7z/fix_install.patch

-43
This file was deleted.

Diff for: cmake/vcpkg/ports/bit7z/portfile.cmake

-46
This file was deleted.

Diff for: cmake/vcpkg/ports/bit7z/unofficial-bit7z-config.cmake.in

-10
This file was deleted.

Diff for: cmake/vcpkg/ports/bit7z/vcpkg.json

-25
This file was deleted.

0 commit comments

Comments
 (0)