Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[simdjson] Update to 0.4.6 #12140

Merged
merged 14 commits into from
Jul 7, 2020
Merged

[simdjson] Update to 0.4.6 #12140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff7ca73
[simdjson] Update to 0.4.1
myd7349 Jun 28, 2020
b065c0c
[simdjson] Update to v0.4.2
myd7349 Jun 29, 2020
2e58d5a
[simdjson] arm-uwp is supported now
myd7349 Jun 29, 2020
fc7808f
Update scripts/ci.baseline.txt
JackBoosY Jun 29, 2020
80d9abc
[simdjson] x86 is also supported now(though not recommended)
myd7349 Jun 29, 2020
aaef1b8
[simdjson] Update to 0.4.3 (it will fail)
myd7349 Jun 30, 2020
0304f59
[simdjson] Disable Ninja temporarily
myd7349 Jun 30, 2020
c1b4e3f
[simdjson] Update to 0.4.4
myd7349 Jun 30, 2020
de8778b
[simdjson] Update to 0.4.5
myd7349 Jul 1, 2020
9737d90
Merge branch 'master' into simdjson-v0.4.1
myd7349 Jul 1, 2020
c6d001f
[simdjson] Add manifest file
myd7349 Jul 1, 2020
835ab21
Merge branch 'master' into simdjson-v0.4.1
myd7349 Jul 4, 2020
d28e09c
[simdjson] Update to 0.4.6
myd7349 Jul 4, 2020
73a4102
Update ports/simdjson/portfile.cmake
JackBoosY Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions ports/simdjson/CONTROL
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions ports/simdjson/no_benchmark.patch
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions ports/simdjson/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894
vcpkg_fail_port_install(ON_ARCH "x86")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lemire/simdjson
REF ac0c3093f4935fd266656abc9311a63fad98e99e
SHA512 69bc9ce45839d5e42aefcf5a96f82f3049b05591f4d463b788365123ba06c36f0f784ede02e5015bd96bf8d0e631ccaac285ed5a63048113f2ea01d91d51b395
REPO simdjson/simdjson
REF 74870a81898ba44407f5dce1f0f50d4ea53fca04 # v0.4.6
HEAD_REF master
PATCHES
no_benchmark.patch # `_pclose` is not available on UWP
SHA512 abd8621cb5ed2a9ccad54c2b9e09a2fc8c8fe5d6a70501d23b879f33e34a6c25d33901b385615e9bb29817c302977aa89bc0ab2a13365e413da557f1a099dd21
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC)
Expand All @@ -20,6 +15,7 @@ vcpkg_configure_cmake(
OPTIONS
-DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC}
-DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64}
-DSIMDJSON_JUST_LIBRARY=ON
-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
-DSIMDJSON_COMPETITION=OFF
-DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495
Expand Down
7 changes: 7 additions & 0 deletions ports/simdjson/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "simdjson",
"version-string": "0.4.6",
"description": "A extremely fast JSON library that can parse gigabytes of JSON per second",
"homepage": "https://simdjson.org/",
"license": "Apache-2.0"
}
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1621,8 +1621,6 @@ shogun:x64-windows-static = skip
shogun:x86-windows = skip
signalrclient:x64-uwp=fail
signalrclient:arm-uwp=fail
simdjson:arm-uwp=fail
simdjson:x86-windows=fail
skia:arm64-windows=fail
skia:arm-uwp=fail
skia:x64-linux=fail
Expand Down