diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2019-12-24 07:36:57 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2019-12-23 15:36:57 -0800 |
| commit | 85c57726ecf42e326f03dea534067ceb1cf1506c (patch) | |
| tree | cd44d21d04da99558869f3c92bcc375e77f4c6fc | |
| parent | 8711ceb3c173f2c11fe9676cd2fe45a6176bf2b9 (diff) | |
| download | vcpkg-85c57726ecf42e326f03dea534067ceb1cf1506c.tar.gz vcpkg-85c57726ecf42e326f03dea534067ceb1cf1506c.zip | |
[pmdk] Remove non-ascii charactor (#9094)
| -rw-r--r-- | ports/pmdk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pmdk/portfile.cmake | 14 | ||||
| -rw-r--r-- | ports/pmdk/remove-non-ascii-character.patch | 17 |
3 files changed, 22 insertions, 11 deletions
diff --git a/ports/pmdk/CONTROL b/ports/pmdk/CONTROL index a96dad85f..c2e5bed30 100644 --- a/ports/pmdk/CONTROL +++ b/ports/pmdk/CONTROL @@ -1,4 +1,4 @@ Source: pmdk -Version: 1.7 +Version: 1.7-1 Homepage: https://github.com/pmem/pmdk Description: Persistent Memory Development Kit diff --git a/ports/pmdk/portfile.cmake b/ports/pmdk/portfile.cmake index 5635bcff7..e8f1c309e 100644 --- a/ports/pmdk/portfile.cmake +++ b/ports/pmdk/portfile.cmake @@ -1,12 +1,6 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) -if (TRIPLET_SYSTEM_ARCH MATCHES "arm") - message(FATAL_ERROR "ARM is currently not supported") -elseif (TRIPLET_SYSTEM_ARCH MATCHES "x86") - message(FATAL_ERROR "x86 is not supported. Please use pmdk:x64-windows instead.") -endif() +vcpkg_fail_port_install(ON_ARCH "arm" "x86") set(PMDK_VERSION "1.7") @@ -16,6 +10,8 @@ vcpkg_from_github( REF bc5e309485df61c452d08367e4b13ba9dfed5071 #Commit id corresponding to the version 1.7 SHA512 15bee6a046746e4ab7e827bb36685bc5d9cdffdbc68ba86eb71e2c4bd84eb4fed4586c09174257bfd87ea178c8ee9865a8824842d7d1df67e0ae79ff80cf650e HEAD_REF master + PATCHES + remove-non-ascii-character.patch ) # Build only the selected projects @@ -59,6 +55,4 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/pmdk) vcpkg_copy_pdbs() -# Handle copyright -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/pmdk) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/pmdk/LICENSE ${CURRENT_PACKAGES_DIR}/share/pmdk/copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/pmdk/remove-non-ascii-character.patch b/ports/pmdk/remove-non-ascii-character.patch new file mode 100644 index 000000000..a133bee95 --- /dev/null +++ b/ports/pmdk/remove-non-ascii-character.patch @@ -0,0 +1,17 @@ +diff --git a/src/libpmemobj/critnib.c b/src/libpmemobj/critnib.c
+index 41fec79..f201dbd 100644
+--- a/src/libpmemobj/critnib.c
++++ b/src/libpmemobj/critnib.c
+@@ -360,9 +360,9 @@ alloc_leaf(struct critnib *__restrict c)
+ * crinib_insert -- write a key:value pair to the critnib structure
+ *
+ * Returns:
+- * • 0 on success
+- * • EEXIST if such a key already exists
+- * • ENOMEM if we're out of memory
++ * 0 on success
++ * EEXIST if such a key already exists
++ * ENOMEM if we're out of memory
+ *
+ * Takes a global write lock but doesn't stall any readers.
+ */
|