diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-12-22 14:52:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-22 14:52:58 -0800 |
| commit | 229f537c9414da5a577484b467a1f7ab0f4d8f34 (patch) | |
| tree | a4a61de332ac64af281acbc7fb6ba94a30cb6f35 /ports | |
| parent | b23b7ea09f9c9aa95cb6e5042e3b1ab1bb8d710d (diff) | |
| download | vcpkg-229f537c9414da5a577484b467a1f7ab0f4d8f34.tar.gz vcpkg-229f537c9414da5a577484b467a1f7ab0f4d8f34.zip | |
[opentracing] Update VMs 2020-12 (#15151)
* Add meson from https://github.com/microsoft/vcpkg/pull/12860/
* Add autoconf-archive from https://github.com/microsoft/vcpkg/pull/13081/
* Add kf5windowsystem libs from https://github.com/microsoft/vcpkg/pull/13467/
* Open the FTP and SFTP ports from https://github.com/microsoft/vcpkg/pull/14412/
* Add libxcb-util0-dev from https://github.com/microsoft/vcpkg/pull/14678/
* Add libasound2-dev from https://github.com/microsoft/vcpkg/pull/14774
* Remove no longer necessary apt-mark calls.
* Update nasm on Linux.
* Fix longstanding bug where Storage was publicly accessible and change to generate SAS token rather than File Share
* Delete no longer necessary azure storage firewall rules.
* Install the newer Windows SDK with the VS installer instead of manually.
* Install the VS2015 and VS2017 compilers.
* Update Powershell-Core to 7.1.0.
* Update source of WDK.
* Update pools.
* [opentracing] Repair arm64-windows failures caused by mojibake in `expected.hpp` and errors in opentracing-cpp's lint for arm64 where it thinks exceptions are disabled when they are enabled.
Fixes:
C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001).
Fixes:
D:\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\include\opentracing/tracer.h:223:5: error: cannot use 'try' with exceptions disabled [clang-diagnostic-error]
try {
^
* [mmloader] Patch out overrides of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS that inserted /WX.
Note that this port sets /GS-, possibly because it may be for authoring shellcode.
* Bump storage API version to 2020-04-08.
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/mmloader/CONTROL | 8 | ||||
| -rw-r--r-- | ports/mmloader/fix_c_and_cxx_flags.patch | 32 | ||||
| -rw-r--r-- | ports/mmloader/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/mmloader/vcpkg.json | 13 | ||||
| -rw-r--r-- | ports/opentracing/CONTROL | 5 | ||||
| -rw-r--r-- | ports/opentracing/portfile.cmake | 16 | ||||
| -rw-r--r-- | ports/opentracing/repair_mojibake.patch | 59 | ||||
| -rw-r--r-- | ports/opentracing/vcpkg.json | 8 |
8 files changed, 125 insertions, 25 deletions
diff --git a/ports/mmloader/CONTROL b/ports/mmloader/CONTROL deleted file mode 100644 index e57556062..000000000 --- a/ports/mmloader/CONTROL +++ /dev/null @@ -1,8 +0,0 @@ -Source: mmloader -Version: 2020-05-15 -Description: A library for loading dll module bypassing windows PE loader from memory (x86/x64) -Homepage: http://tishion.github.io/mmLoader/ -Supports: (x86|x64)&windows&static - -Feature: shellcode -Description: Generate mmLoader shell code headers diff --git a/ports/mmloader/fix_c_and_cxx_flags.patch b/ports/mmloader/fix_c_and_cxx_flags.patch new file mode 100644 index 000000000..501ce40cd --- /dev/null +++ b/ports/mmloader/fix_c_and_cxx_flags.patch @@ -0,0 +1,32 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a22b56..2ce1bd8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,24 +47,11 @@ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CONFIGURATION_TYPES Debug Release)
+
+ # Default compile flags
+-set(CMAKE_CXX_FLAGS
+- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GS-"
+ CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_CXX_FLAGS_DEBUG
+- "/MTd /Ob0 /Od"
+- CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_CXX_FLAGS_RELEASE
+- "/MT /O2 /Ob2 /DNDEBUG"
+- CACHE STRING "default C++ compile flags for release build" FORCE)
+-set(CMAKE_C_FLAGS
+- "/DWIN32 /D_WINDOWS /W3 /WX /GR /GS- /Gy /FAcs /Z7 /DEBUG"
++set(CMAKE_C_FLAGS
++ "${CMAKE_C_FLAGS} /GS-"
+ CACHE STRING "default C++ compile flags" FORCE)
+-set(CMAKE_C_FLAGS_DEBUG
+- "/MTd /Ob0 /Od"
+- CACHE STRING "default C++ compile flags for debug build" FORCE)
+-set(CMAKE_C_FLAGS_RELEASE
+- "/MT /O2 /Ob2 /DNDEBUG"
+- CACHE STRING "default C++ compile flags for release build" FORCE)
+
+ message(STATUS "CMAKE_CXX_FLAGS=" ${CMAKE_CXX_FLAGS})
+ message(STATUS "CMAKE_CXX_FLAGS_DEBUG=" ${CMAKE_CXX_FLAGS_DEBUG})
diff --git a/ports/mmloader/portfile.cmake b/ports/mmloader/portfile.cmake index 2a3411ce3..c1f168446 100644 --- a/ports/mmloader/portfile.cmake +++ b/ports/mmloader/portfile.cmake @@ -1,4 +1,3 @@ - # fail early for unsupported triplets vcpkg_fail_port_install( MESSAGE "mmLoader supports only x86/x64-windows-static triplets" @@ -15,6 +14,8 @@ vcpkg_from_github( REF 1.0.0 SHA512 ceb2ab4b60d74209fa46d198cde6fd87a97d911abb875ac35383288a67828d0420bb38ff8d2f17dd4a3f46ba3abf554152d1246eeb05215258e8af64ac4a39de HEAD_REF master + PATCHES + fix_c_and_cxx_flags.patch ) # feature @@ -30,13 +31,13 @@ vcpkg_configure_cmake( ) # pre-clean -file(REMOVE_RECURSE ${SOURCE_PATH}/output) +file(REMOVE_RECURSE "${SOURCE_PATH}/output") # build and install vcpkg_install_cmake(DISABLE_PARALLEL) # remove the debug/include directory -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # collect license files -file(INSTALL ${SOURCE_PATH}/License DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mmloader/vcpkg.json b/ports/mmloader/vcpkg.json new file mode 100644 index 000000000..a48ecb38b --- /dev/null +++ b/ports/mmloader/vcpkg.json @@ -0,0 +1,13 @@ +{ + "name": "mmloader", + "version-string": "2020-05-15", + "port-version": 1, + "description": "A library for loading dll module bypassing windows PE loader from memory (x86/x64)", + "homepage": "http://tishion.github.io/mmLoader/", + "supports": "(x86 | x64) & windows & static", + "features": { + "shellcode": { + "description": "Generate mmLoader shell code headers" + } + } +} diff --git a/ports/opentracing/CONTROL b/ports/opentracing/CONTROL deleted file mode 100644 index 08c664f1b..000000000 --- a/ports/opentracing/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: opentracing
-Version: 1.6.0 -Description: C++ implementation of the OpenTracing API
-Homepage: https://opentracing.io
-Supports: !uwp
\ No newline at end of file diff --git a/ports/opentracing/portfile.cmake b/ports/opentracing/portfile.cmake index 817b2a5a1..61c1516cb 100644 --- a/ports/opentracing/portfile.cmake +++ b/ports/opentracing/portfile.cmake @@ -1,9 +1,7 @@ -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
- message(FATAL_ERROR "Error: UWP build is not supported.")
-endif()
+vcpkg_fail_port_install(ON_TARGET uwp)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
- set( LOCAL_OPTIONS
+ set(LOCAL_OPTIONS
-DBUILD_STATIC_LIBS=OFF
)
else()
@@ -16,13 +14,15 @@ vcpkg_from_github( REPO opentracing/opentracing-cpp
REF 4bb431f7728eaf383a07e86f9754a5b67575dab0 # v1.6.0
SHA512 1c69ff4cfd5f6037a48815367d3026c1bf06c3c49ebf232a64c43167385fb62e444c3b3224fc38f68ef0fdb378e3736db6ee6ba57160e6e578c87c09e92e527e
+ PATCHES
+ repair_mojibake.patch
)
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
+ SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
- ${OPTIONS}
+ -DENABLE_LINTING=OFF
${LOCAL_OPTIONS}
)
@@ -54,7 +54,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAM endif()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opentracing RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# Remove duplicate headers
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/opentracing/repair_mojibake.patch b/ports/opentracing/repair_mojibake.patch new file mode 100644 index 000000000..ae427e661 --- /dev/null +++ b/ports/opentracing/repair_mojibake.patch @@ -0,0 +1,59 @@ +From 31c92781ac953cb83963cfe5ac30324579fa7b2d Mon Sep 17 00:00:00 2001 +From: Billy Robert O'Neal III <bion@microsoft.com> +Date: Fri, 18 Dec 2020 10:07:02 -0800 +Subject: [PATCH] Repair mojibake in expected.hpp + +The affected characters herein triggered warnings +C:\Dev\vcpkg\buildtrees\opentracing\src\b67575dab0-0250653c81.clean\3rd_party\include\opentracing/expected/expected.hpp(1): warning C4828: The file contains a character starting at offset 0x4a77 that is illegal in the current source character set (codepage 65001). +--- + 3rd_party/include/opentracing/expected/expected.hpp | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/3rd_party/include/opentracing/expected/expected.hpp b/3rd_party/include/opentracing/expected/expected.hpp +index 8283a77..0d21d43 100644 +--- a/3rd_party/include/opentracing/expected/expected.hpp ++++ b/3rd_party/include/opentracing/expected/expected.hpp +@@ -778,13 +778,13 @@ class expected + // expected<decltype(func(declval<T>())),E> map(F&& func) ; + + // template <typename F> +-// ’see below’ bind(F&& func); ++// 'see below' bind(F&& func); + + // template <typename F> + // expected<T,E> catch_error(F&& f); + + // template <typename F> +-// ’see below’ then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; +@@ -955,9 +955,9 @@ class expected<void, E> + return ! has_value() && std::is_base_of< Ex, decltype( get_unexpected().value() ) >::value; + } + +-// template constexpr ’see below’ unwrap() const&; ++// template constexpr 'see below' unwrap() const&; + // +-// template ’see below’ unwrap() &&; ++// template 'see below' unwrap() &&; + + // factories + +@@ -968,13 +968,13 @@ class expected<void, E> + // expected<decltype(func()), E> map(F&& func) ; + // + // template <typename F> +-// ’see below’ bind(F&& func) ; ++// 'see below' bind(F&& func) ; + // + // template <typename F> + // expected<void,E> catch_error(F&& f); + // + // template <typename F> +-// ’see below’ then(F&& func); ++// 'see below' then(F&& func); + + private: + bool has_value_; diff --git a/ports/opentracing/vcpkg.json b/ports/opentracing/vcpkg.json new file mode 100644 index 000000000..d61870038 --- /dev/null +++ b/ports/opentracing/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "opentracing", + "version-string": "1.6.0", + "port-version": 1, + "description": "C++ implementation of the OpenTracing API", + "homepage": "https://opentracing.io", + "supports": "!uwp" +} |
