diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-07-14 12:46:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 12:46:05 -0700 |
| commit | 957d2024b8d6ef44164559645dd898c306066964 (patch) | |
| tree | 7efb14324d139bc22556cdf9d3896469a5846399 /ports/soem | |
| parent | d369df7ecf194005eaca46f07368779cd486badd (diff) | |
| download | vcpkg-957d2024b8d6ef44164559645dd898c306066964.tar.gz vcpkg-957d2024b8d6ef44164559645dd898c306066964.zip | |
Update to Ubuntu 20.04. (#18892)
* Update Ubuntu to 20.04.
* [tfhe] Disable -Wall -Werror
* [sophus] Disable -Werror.
* Fix typo in deployment of CUDA.
* Add libxxf86vm-dev for opensubdiv.
* [opensubdiv] Fix OpenCL search on Ubuntu 20.04, and document libxxf86vm-dev dependency
* [msgpack11] Disable -Werror.
* [qtwayland, qt5wayland] Add system library notice.
* Add python-is-python3 to unbreak tensorflow, v8, and others
* [graphqlparser] Remove directive rejected by Bison 3.5.1
* [ogdf] Mark as failing in ci.baseline.txt. Issue filed https://github.com/microsoft/vcpkg/issues/18936
* [bde] Mark failing in ci.baseline.txt, issue filed https://github.com/microsoft/vcpkg/issues/18937
* [soem] Patch out -Werror
* Update pool.
Diffstat (limited to 'ports/soem')
| -rw-r--r-- | ports/soem/CONTROL | 5 | ||||
| -rw-r--r-- | ports/soem/disable-werror.patch | 42 | ||||
| -rw-r--r-- | ports/soem/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/soem/vcpkg.json | 14 |
4 files changed, 58 insertions, 6 deletions
diff --git a/ports/soem/CONTROL b/ports/soem/CONTROL deleted file mode 100644 index f3194a53b..000000000 --- a/ports/soem/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: soem
-Version: 1.4.0
-Homepage: https://github.com/OpenEtherCATsociety/SOEM
-Description: Simple Open Source EtherCAT Master
-Build-Depends: winpcap (windows)
diff --git a/ports/soem/disable-werror.patch b/ports/soem/disable-werror.patch new file mode 100644 index 000000000..7c1fd9685 --- /dev/null +++ b/ports/soem/disable-werror.patch @@ -0,0 +1,42 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1778965..4c481b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE) + + if(WIN32) + set(OS "win32") +- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+- find_library(winpcap_LIBRARY NAMES wpcap)
+- find_library(packet_LIBRARY NAMES packet)
+- include_directories(${winpcap_INCLUDE_DIRS})
++ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h) ++ find_library(winpcap_LIBRARY NAMES wpcap) ++ find_library(packet_LIBRARY NAMES packet) ++ include_directories(${winpcap_INCLUDE_DIRS}) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") +- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
++ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib) + elseif(UNIX AND NOT APPLE) + set(OS "linux") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread rt) + elseif(APPLE) + # This must come *before* linux or MacOSX will identify as Unix. + set(OS "macosx") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") + set(OS_LIBS pthread pcap) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + set(OS "rtk") +@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel") + include_directories(oshw/${OS}/${ARCH}) + file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c) + set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format") + set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems") + message("Building for RTEMS") diff --git a/ports/soem/portfile.cmake b/ports/soem/portfile.cmake index 3eccfeb3a..e80e64a3e 100644 --- a/ports/soem/portfile.cmake +++ b/ports/soem/portfile.cmake @@ -8,8 +8,9 @@ vcpkg_from_github( REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
HEAD_REF master
- PATCHES
+ PATCHES
winpcap.patch
+ disable-werror.patch
)
vcpkg_configure_cmake(
diff --git a/ports/soem/vcpkg.json b/ports/soem/vcpkg.json new file mode 100644 index 000000000..ffa002687 --- /dev/null +++ b/ports/soem/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "soem", + "version-string": "1.4.0", + "port-version": 2, + "description": "Simple Open Source EtherCAT Master", + "homepage": "https://github.com/OpenEtherCATsociety/SOEM", + "supports": "!uwp", + "dependencies": [ + { + "name": "winpcap", + "platform": "windows" + } + ] +} |
