diff options
| author | Alexandro Sanchez <alexandro@phi.nz> | 2020-04-21 22:19:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 13:19:48 -0700 |
| commit | 84041ca52a062499aed7236e997f5aaceb7f864c (patch) | |
| tree | 0b69c2bb92a7202daf05d456d1fc00134aa59efc | |
| parent | 1da127ed7cfdbf95082e7fc0092acfc168db7595 (diff) | |
| download | vcpkg-84041ca52a062499aed7236e997f5aaceb7f864c.tar.gz vcpkg-84041ca52a062499aed7236e997f5aaceb7f864c.zip | |
[libyaml] Fix linkage in non-Windows systems (#10908)
Signed-off-by: Alexandro Sanchez <alexandro@phi.nz>
| -rw-r--r-- | ports/libyaml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libyaml/portfile.cmake | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ports/libyaml/CONTROL b/ports/libyaml/CONTROL index 6dbff7ff3..b5084150b 100644 --- a/ports/libyaml/CONTROL +++ b/ports/libyaml/CONTROL @@ -1,3 +1,3 @@ Source: libyaml
-Version: 0.2.2-2 +Version: 0.2.2-3
Description: A C library for parsing and emitting YAML.
diff --git a/ports/libyaml/portfile.cmake b/ports/libyaml/portfile.cmake index 3d7f12d7e..716f69181 100644 --- a/ports/libyaml/portfile.cmake +++ b/ports/libyaml/portfile.cmake @@ -1,4 +1,6 @@ -include(vcpkg_common_functions)
+if (WIN32)
+ set(PATCHES fix-POSIX_name.patch)
+endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -6,8 +8,7 @@ vcpkg_from_github( REF 0.2.2
SHA512 455494591014a97c4371a1f372ad09f0d6e487e4f1d3419c98e9cd2f16d43a0cf9a0787d7250bebee8b8d400df4626f5acd81e90139e54fa574a66ec84964c06
HEAD_REF master
- PATCHES
- fix-POSIX_name.patch
+ PATCHES ${PATCHES}
)
vcpkg_configure_cmake(
@@ -25,4 +26,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/yaml TARGET_PATH share/yaml) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/include/config.h ${CURRENT_PACKAGES_DIR}/debug/share)
-configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/libyaml/copyright COPYONLY)
+configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
|