From ea07b5d3cd581e924b4c49295b773d775ce33d25 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Wed, 27 May 2020 14:00:24 +0800 Subject: [PATCH] [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 885e8a8af4bcce2c02207d95cbfdce7078dd4a3b. * [simdjson] Update * [simdjson] Update to 2020-05-26 --- ports/simdjson/CONTROL | 4 ++-- ports/simdjson/Fix-error-LNK2001.patch | 15 --------------- ports/simdjson/no_benchmark.patch | 22 +++++++--------------- ports/simdjson/portfile.cmake | 23 +++++++++++------------ scripts/ci.baseline.txt | 1 - 5 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 ports/simdjson/Fix-error-LNK2001.patch diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index 1d48f1ae0..585ba0fa8 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,5 +1,5 @@ Source: simdjson -Version: 2019-12-27-1 +Version: 2020-05-26 Description: A extremely fast JSON library that can parse gigabytes of JSON per second Homepage: https://github.com/lemire/simdjson -Supports: !(x86|arm|arm64) \ No newline at end of file +Supports: !x86 diff --git a/ports/simdjson/Fix-error-LNK2001.patch b/ports/simdjson/Fix-error-LNK2001.patch deleted file mode 100644 index d7dd61a2d..000000000 --- a/ports/simdjson/Fix-error-LNK2001.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tools/cmake/FindOptions.cmake b/tools/cmake/FindOptions.cmake -index f9854c1..0c4d331 100644 ---- a/tools/cmake/FindOptions.cmake -+++ b/tools/cmake/FindOptions.cmake -@@ -4,9 +4,9 @@ endmacro(append) - - set(SANITIZE_FLAGS "") - if(SIMDJSON_SANITIZE) -- set(SIMDJSON_SANITIZE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all") - if (CMAKE_COMPILER_IS_GNUCC) - # Ubuntu bug for GCC 5.0+ (safe for all versions) -+ set(SIMDJSON_SANITIZE_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fsanitize=undefined -fno-sanitize-recover=all") - append(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold") - append(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=gold") - endif() diff --git a/ports/simdjson/no_benchmark.patch b/ports/simdjson/no_benchmark.patch index 74c40fd74..7ec15869e 100644 --- a/ports/simdjson/no_benchmark.patch +++ b/ports/simdjson/no_benchmark.patch @@ -1,20 +1,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9668819..cf5e89f 100644 +index 42640bc..7a621a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,6 @@ include(include/CMakeLists.txt) - add_subdirectory(src) - add_subdirectory(tools) +@@ -42,7 +42,6 @@ add_subdirectory(singleheader) + add_subdirectory(dependencies) add_subdirectory(tests) + add_subdirectory(examples) -add_subdirectory(benchmark) - - # for fuzzing, read the comments in the fuzz/CMakeLists.txt file - option(ENABLE_FUZZING "enable building the fuzzers" ON) -@@ -73,5 +72,3 @@ set(CPACK_RPM_PACKAGE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") - set(CPACK_SOURCE_GENERATOR "TGZ;ZIP") - - include(CPack) -- -- --- -2.20.1.windows.1 + add_subdirectory(fuzz) + + # diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index 837de6983..be6f80a0a 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,26 +1,28 @@ # https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894 -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "x86") +vcpkg_fail_port_install(ON_ARCH "x86") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lemire/simdjson - REF 4da06830f1389c8cd33171f5ab3558e79f0ece04 - SHA512 ffb11ee91f97d975fba2946653c9c847565933380f94e334d15e627f77a7a750702c539ca55d17e077b2ed0a79006f56a3b9a202d888bb7e2e3f0484237cb537 + REF ac0c3093f4935fd266656abc9311a63fad98e99e + SHA512 69bc9ce45839d5e42aefcf5a96f82f3049b05591f4d463b788365123ba06c36f0f784ede02e5015bd96bf8d0e631ccaac285ed5a63048113f2ea01d91d51b395 HEAD_REF master - PATCHES - no_benchmark.patch - Fix-error-LNK2001.patch + PATCHES + no_benchmark.patch # `_pclose` is not available on UWP ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_TARGET_ARCHITECTURE}" "arm64" SIMDJSON_IMPLEMENTATION_ARM64) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS -DSIMDJSON_BUILD_STATIC=${SIMDJSON_BUILD_STATIC} - OPTIONS_DEBUG - -DSIMDJSON_SANITIZE=ON + -DSIMDJSON_IMPLEMENTATION_ARM64=${SIMDJSON_IMPLEMENTATION_ARM64} + -DSIMDJSON_GOOGLE_BENCHMARKS=OFF + -DSIMDJSON_COMPETITION=OFF + -DSIMDJSON_SANITIZE=OFF # issue 10145, pr 11495 ) vcpkg_install_cmake() @@ -29,9 +31,6 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/debug/include -) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -# Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ce54d585e..c2f43e40b 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1707,7 +1707,6 @@ shogun:x64-windows-static = skip shogun:x86-windows = skip signalrclient:x64-uwp=fail signalrclient:arm-uwp=fail -simdjson:arm64-windows=fail simdjson:arm-uwp=fail simdjson:x86-windows=fail skia:arm64-windows=fail