diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-09-28 08:33:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 17:33:19 -0700 |
| commit | bfc0f488335725763b5e966641cbec738aa7a485 (patch) | |
| tree | ccb508769ecbd3611bcf1034e1befae8a3702290 /ports/xxhash | |
| parent | ae82a554f80e49f29d528f6ec395211ea0b7939b (diff) | |
| download | vcpkg-bfc0f488335725763b5e966641cbec738aa7a485.tar.gz vcpkg-bfc0f488335725763b5e966641cbec738aa7a485.zip | |
[libyaml/sqlpp11/xeus/uvatlas/xxhash] Update to the latest version (#13657)
* [many ports] Update to the latest version
* [xeus] Fix static build
* [usd] Revert change
* [xeus] Fix build error
* [sqlpp11] Update latest version
* [libyaml] Fix build error on Linux
* [sqlpp11] Fix build error
Diffstat (limited to 'ports/xxhash')
| -rw-r--r-- | ports/xxhash/CONTROL | 2 | ||||
| -rw-r--r-- | ports/xxhash/fix-arm-uwp.patch | 34 | ||||
| -rw-r--r-- | ports/xxhash/portfile.cmake | 11 |
3 files changed, 5 insertions, 42 deletions
diff --git a/ports/xxhash/CONTROL b/ports/xxhash/CONTROL index be4cc2900..e641b229a 100644 --- a/ports/xxhash/CONTROL +++ b/ports/xxhash/CONTROL @@ -1,4 +1,4 @@ Source: xxhash
-Version: 0.7.0
+Version: 0.8.0
Homepage: https://github.com/Cyan4973/xxHash
Description: Extremely fast hash algorithm
diff --git a/ports/xxhash/fix-arm-uwp.patch b/ports/xxhash/fix-arm-uwp.patch deleted file mode 100644 index 51bbc7474..000000000 --- a/ports/xxhash/fix-arm-uwp.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/xxh3.h b/xxh3.h -index 0972c46..e5c7101 100644 ---- a/xxh3.h -+++ b/xxh3.h -@@ -40,7 +40,7 @@ - #ifndef XXH3_H - #define XXH3_H - -- -+#pragma warning (disable : 4146) - /* === Dependencies === */ - - #undef XXH_INLINE_ALL /* in case it's already defined */ -@@ -97,7 +97,7 @@ - #endif - - /* U64 XXH_mult32to64(U32 a, U64 b) { return (U64)a * (U64)b; } */ --#ifdef _MSC_VER -+#if defined(_MSC_VER) && (!_WIN32_WINNT >= 0x0A00) - # include <intrin.h> - /* MSVC doesn't do a good job with the mull detection. */ - # define XXH_mult32to64 __emulu -diff --git a/xxhsum.c b/xxhsum.c -index 0ec11c0..7d39c24 100644 ---- a/xxhsum.c -+++ b/xxhsum.c -@@ -31,6 +31,7 @@ - #ifndef XXHASH_C_2097394837 - #define XXHASH_C_2097394837 - -+#pragma warning (disable : 4146) - /* ************************************ - * Compiler Options - **************************************/ diff --git a/ports/xxhash/portfile.cmake b/ports/xxhash/portfile.cmake index 74b19715f..95a9c3c0d 100644 --- a/ports/xxhash/portfile.cmake +++ b/ports/xxhash/portfile.cmake @@ -1,14 +1,11 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Cyan4973/xxHash - REF a728fc9fe895460ff0e5f1efc2ce233d2095fd20 - SHA512 7795be00054d5f7abf4afab5912cc532bfc47f0bc8278cf09a44feb854f11e921d3d43e734efda1edbae0722450e4f9f02eeb5954220293eac930b4fa13ff737 + REF 94e5f23e736f2bb67ebdf90727353e65344f9fc0 # v0.8.0 + SHA512 367c82b37fd188890574446a7c237294a4a9ba038aff9a19a5d5d119058df74c089c682e9abad3281d5e14020c08834666343b2ea18378f400c8a0ee640098b8 HEAD_REF dev - PATCHES fix-arm-uwp.patch ) vcpkg_configure_cmake( @@ -18,10 +15,10 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/xxHash TARGET_PATH share/${PORT}) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xxhash) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/xxhash/LICENSE ${CURRENT_PACKAGES_DIR}/share/xxhash/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |