diff options
| author | Leonid Pospelov <pospelovlm@yandex.ru> | 2020-01-06 22:14:52 +0300 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 11:14:52 -0800 |
| commit | bff594f7ff8e023592f366b67fd7f57f4fe035e7 (patch) | |
| tree | ac2badc6b52d8b7e5011f181097851212b2a1f7c | |
| parent | 96bfe1b594f89de585565287626d7b02e1637b19 (diff) | |
| download | vcpkg-bff594f7ff8e023592f366b67fd7f57f4fe035e7.tar.gz vcpkg-bff594f7ff8e023592f366b67fd7f57f4fe035e7.zip | |
[simdjson] Update library (#9484)
| -rw-r--r-- | ports/simdjson/CONTROL | 2 | ||||
| -rw-r--r-- | ports/simdjson/no_benchmark.patch | 20 | ||||
| -rw-r--r-- | ports/simdjson/portfile.cmake | 18 |
3 files changed, 26 insertions, 14 deletions
diff --git a/ports/simdjson/CONTROL b/ports/simdjson/CONTROL index df8c5deba..14f70df1c 100644 --- a/ports/simdjson/CONTROL +++ b/ports/simdjson/CONTROL @@ -1,4 +1,4 @@ Source: simdjson
-Version: 2019-08-05
+Version: 2019-12-27
Description: A extremely fast JSON library that can parse gigabytes of JSON per second
Homepage: https://github.com/lemire/simdjson
diff --git a/ports/simdjson/no_benchmark.patch b/ports/simdjson/no_benchmark.patch new file mode 100644 index 000000000..74c40fd74 --- /dev/null +++ b/ports/simdjson/no_benchmark.patch @@ -0,0 +1,20 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9668819..cf5e89f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,6 @@ include(include/CMakeLists.txt) + add_subdirectory(src) + add_subdirectory(tools) + add_subdirectory(tests) +-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 diff --git a/ports/simdjson/portfile.cmake b/ports/simdjson/portfile.cmake index a5eea7b68..c8f3b67ec 100644 --- a/ports/simdjson/portfile.cmake +++ b/ports/simdjson/portfile.cmake @@ -1,18 +1,13 @@ -include(vcpkg_common_functions)
-
# https://github.com/Microsoft/vcpkg/issues/5418#issuecomment-470519894
-if(TARGET_TRIPLET MATCHES "^(x86|arm-)")
- message(FATAL_ERROR "simdjson doesn't support x86 or 32-bit ARM architecture.")
-elseif(TARGET_TRIPLET MATCHES "^arm64")
- message(FATAL_ERROR "simdjson doesn't support ARM64 architecture currently.")
-endif()
+vcpkg_fail_port_install(ON_ARCH "arm" "arm64" "x86")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO lemire/simdjson
- REF d9a0e2b8f441c20ad46276fdb8ce24f2aebdc07b
- SHA512 05523c59b95485b93646370ac1ef9f80a72351a5bfe76797c5bbbf249bedd81b962dad19040a7eaac80744aaec18be9bec1120da44a9a1e4328e68b3d671bdaf
+ REF 4da06830f1389c8cd33171f5ab3558e79f0ece04
+ SHA512 ffb11ee91f97d975fba2946653c9c847565933380f94e334d15e627f77a7a750702c539ca55d17e077b2ed0a79006f56a3b9a202d888bb7e2e3f0484237cb537
HEAD_REF master
+ PATCHES ${CMAKE_CURRENT_LIST_DIR}/no_benchmark.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SIMDJSON_BUILD_STATIC)
@@ -37,7 +32,4 @@ file(REMOVE_RECURSE )
# Handle copyright
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-
-# CMake integration test
-vcpkg_test_cmake(PACKAGE_NAME ${PORT})
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|