Skip to content

Commit ea07b5d

Browse files
authored
[simdjson] Update to 0.3.1 (#10709)
* [simdjson] Update to 0.3.1 * [simdjson] Update CI baseline * [simdjson] Include arm build * [simdjson] Make UWP happy * [simdjson] Turn off SIMDJSON_COMPETITION for linux * [simdjson] Update to 2020-05-06 [simdjson] Turn off SIMDJSON_SANITIZE under DEBUG mode (#10145) * [simdjson] Update to lastest * wip * [simdjson] Update to 2020-05-20 * [simdjson] Update to 2020-05-21 * [simdjson] Fix ninja build * [simdjson] arm-uwp still not supported * [simdjson] Update to 2020-05-22 and disable UWP patch * [itk] You shall pass * [simdjson] Fix x64-uwp * Revert "[itk] You shall pass" This reverts commit 885e8a8. * [simdjson] Update * [simdjson] Update to 2020-05-26
1 parent 7e4ab79 commit ea07b5d

File tree

5 files changed

+20
-45
lines changed

5 files changed

+20
-45
lines changed

ports/simdjson/CONTROL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Source: simdjson
2-
Version: 2019-12-27-1
2+
Version: 2020-05-26
33
Description: A extremely fast JSON library that can parse gigabytes of JSON per second
44
Homepage: https://github.com/lemire/simdjson
5-
Supports: !(x86|arm|arm64)
5+
Supports: !x86

ports/simdjson/Fix-error-LNK2001.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

ports/simdjson/no_benchmark.patch

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 9668819..cf5e89f 100644
2+
index 42640bc..7a621a8 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -51,7 +51,6 @@ include(include/CMakeLists.txt)
6-
add_subdirectory(src)
7-
add_subdirectory(tools)
5+
@@ -42,7 +42,6 @@ add_subdirectory(singleheader)
6+
add_subdirectory(dependencies)
87
add_subdirectory(tests)
8+
add_subdirectory(examples)
99
-add_subdirectory(benchmark)
10-
11-
# for fuzzing, read the comments in the fuzz/CMakeLists.txt file
12-
option(ENABLE_FUZZING "enable building the fuzzers" ON)
13-
@@ -73,5 +72,3 @@ set(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
14-
set(CPACK_SOURCE_GENERATOR "TGZ;ZIP")
15-
16-
include(CPack)
17-
-
18-
-
19-
--
20-
2.20.1.windows.1
10+
add_subdirectory(fuzz)
11+
12+
#

ports/simdjson/portfile.cmake

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
# https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894
2-
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "x86")
2+
vcpkg_fail_port_install(ON_ARCH "x86")
33

44
vcpkg_from_github(
55
OUT_SOURCE_PATH SOURCE_PATH
66
REPO lemire/simdjson
7-
REF 4da06830f1389c8cd33171f5ab3558e79f0ece04
8-
SHA512 ffb11ee91f97d975fba2946653c9c847565933380f94e334d15e627f77a7a750702c539ca55d17e077b2ed0a79006f56a3b9a202d888bb7e2e3f0484237cb537
7+
REF ac0c3093f4935fd266656abc9311a63fad98e99e
8+
SHA512 69bc9ce45839d5e42aefcf5a96f82f3049b05591f4d463b788365123ba06c36f0f784ede02e5015bd96bf8d0e631ccaac285ed5a63048113f2ea01d91d51b395
99
HEAD_REF master
10-
PATCHES
11-
no_benchmark.patch
12-
Fix-error-LNK2001.patch
10+
PATCHES
11+
no_benchmark.patch # `_pclose` is not available on UWP
1312
)
1413

1514
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC)
15+
string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64)
1616

1717
vcpkg_configure_cmake(
1818
SOURCE_PATH ${SOURCE_PATH}
1919
PREFER_NINJA
2020
OPTIONS
2121
-DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC}
22-
OPTIONS_DEBUG
23-
-DSIMDJSON_SANITIZE=ON
22+
-DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64}
23+
-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
24+
-DSIMDJSON_COMPETITION=OFF
25+
-DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495
2426
)
2527

2628
vcpkg_install_cmake()
@@ -29,9 +31,6 @@ vcpkg_copy_pdbs()
2931

3032
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
3133

32-
file(REMOVE_RECURSE
33-
${CURRENT_PACKAGES_DIR}/debug/include
34-
)
34+
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
3535

36-
# Handle copyright
3736
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

scripts/ci.baseline.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1707,7 +1707,6 @@ shogun:x64-windows-static = skip
17071707
shogun:x86-windows = skip
17081708
signalrclient:x64-uwp=fail
17091709
signalrclient:arm-uwp=fail
1710-
simdjson:arm64-windows=fail
17111710
simdjson:arm-uwp=fail
17121711
simdjson:x86-windows=fail
17131712
skia:arm64-windows=fail

0 commit comments

Comments
 (0)