diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-06-11 01:05:10 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-06-10 10:05:10 -0700 |
| commit | 381dd779f09c3ea69705c38cdf7cc3656831806a (patch) | |
| tree | 83a16989018656fd77a5dbc316b713de1ca6f42b | |
| parent | 9a6aae5c53f25224c510667430d5aac1d0563e96 (diff) | |
| download | vcpkg-381dd779f09c3ea69705c38cdf7cc3656831806a.tar.gz vcpkg-381dd779f09c3ea69705c38cdf7cc3656831806a.zip | |
[lcm]Upgrade version to 1.4.0 and fix build error. (#6836)
| -rw-r--r-- | ports/lcm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/lcm/fix-build-error.patch | 32 | ||||
| -rw-r--r-- | ports/lcm/portfile.cmake | 11 |
3 files changed, 37 insertions, 8 deletions
diff --git a/ports/lcm/CONTROL b/ports/lcm/CONTROL index 0cca68404..2621e23c5 100644 --- a/ports/lcm/CONTROL +++ b/ports/lcm/CONTROL @@ -1,5 +1,5 @@ Source: lcm -Version: 1.3.95-1 +Version: 1.4.0 Build-Depends: glib Description: Lightweight Communications and Marshalling (LCM) LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages. diff --git a/ports/lcm/fix-build-error.patch b/ports/lcm/fix-build-error.patch new file mode 100644 index 000000000..ffca33d79 --- /dev/null +++ b/ports/lcm/fix-build-error.patch @@ -0,0 +1,32 @@ +diff --git a/lcm/windows/WinPorting.cpp b/lcm/windows/WinPorting.cpp +index e22acd6..b9c7e69 100644 +--- a/lcm/windows/WinPorting.cpp ++++ b/lcm/windows/WinPorting.cpp +@@ -1,8 +1,8 @@ + + #define _WIN32_WINNT 0x0501 +-#include <Mswsock.h> + #include <stdio.h> + #include <winsock2.h> ++#include <Mswsock.h> + + #include "WinPorting.h" + +diff --git a/lcmgen/emit_go.c b/lcmgen/emit_go.c +index c520044..b5be56a 100644 +--- a/lcmgen/emit_go.c ++++ b/lcmgen/emit_go.c +@@ -6,8 +6,13 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef WIN32 ++#include <io.h> ++#else + #include <unistd.h> ++#endif + #ifdef WIN32 ++#define F_OK 0 + #define __STDC_FORMAT_MACROS // Enable integer types + #endif + diff --git a/ports/lcm/portfile.cmake b/ports/lcm/portfile.cmake index b50139f62..ef1633d84 100644 --- a/ports/lcm/portfile.cmake +++ b/ports/lcm/portfile.cmake @@ -3,14 +3,11 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lcm-proj/lcm - REF 82bd3a223e3227c70832307e53a65c13c1e5f81b - SHA512 5d3abf457e18a3bb50489ed17393c5416a459134f73c264e67d174a29411d6deb70c754b5669422a438ea3e5793b9b1b91d67e9d842151c5a910245fede5879f + REF v1.4.0 + SHA512 ca036aa2c31911e0bfaeab9665188c97726201267314693a1c333c4efe13ea598b39a55a19bc1d48e65462ac9d1716adfda5af86c645d59c3247192631247cc6 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES ${CMAKE_CURRENT_LIST_DIR}/only-install-one-flavor.patch + PATCHES only-install-one-flavor.patch + fix-build-error.patch ) vcpkg_configure_cmake( |