From e44fa043308aa49dd9379a539e0e7abd43faad7d Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Tue, 1 Dec 2020 00:46:39 -0800 Subject: [PATCH 1/2] [microsoft-signalr] Fix build failed on Linux --- ports/microsoft-signalr/CONTROL | 3 ++- ports/microsoft-signalr/portfile.cmake | 3 ++- .../remove-fno-rtti-compile-option.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 ports/microsoft-signalr/remove-fno-rtti-compile-option.patch diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL index 0cec60bf9f9bfa..6b0f314a33c334 100644 --- a/ports/microsoft-signalr/CONTROL +++ b/ports/microsoft-signalr/CONTROL @@ -1,5 +1,6 @@ Source: microsoft-signalr -Version: 0.1.0-alpha1-1 +Version: 0.1.0-alpha1 +Port-Version: 2 Description: C++ Client for ASP.NET Core SignalR. Default-Features: default-features Homepage: https://github.com/aspnet/SignalR-Client-Cpp diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index e566f594e49a3b..ff5b6074c7ca99 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -4,6 +4,7 @@ vcpkg_from_github( REF v0.1.0-alpha1 SHA512 d37eea194b0352a08dd89ac7622bdd6224312ad48a31d8ab36627a8aaff5e795e3513ad010eed516703f6da842a95119c1a4a290b145a43e91ff80a37fff8676 HEAD_REF master + PATCHES remove-fno-rtti-compile-option.patch ) vcpkg_check_features( @@ -30,6 +31,6 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/microsoft-signalr) +file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch new file mode 100644 index 00000000000000..816f13c57c8d8c --- /dev/null +++ b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch @@ -0,0 +1,15 @@ +diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt +index 42d64d3..10fa72f 100644 +--- a/src/signalrclient/CMakeLists.txt ++++ b/src/signalrclient/CMakeLists.txt +@@ -58,10 +58,6 @@ else() + target_compile_options(signalrclient PRIVATE -Wall) + endif() + +- # GCC on OSX has a bug with exceptions and no-rtti that can cause crashes +- if(NOT APPLE) +- target_compile_options(signalrclient PRIVATE -fno-rtti) +- endif() + target_compile_options(signalrclient PRIVATE -Wextra -Wpedantic -Wno-unknown-pragmas) + endif() + From 1361a6d4e1e200356c65e707ee7a49e807587d9a Mon Sep 17 00:00:00 2001 From: Nicole Mazzuca Date: Wed, 2 Dec 2020 15:37:43 -0800 Subject: [PATCH 2/2] Nicole CRs --- .../remove-fno-rtti-compile-option.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch index 816f13c57c8d8c..4c2aac20c7b305 100644 --- a/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch +++ b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch @@ -2,14 +2,16 @@ diff --git a/src/signalrclient/CMakeLists.txt b/src/signalrclient/CMakeLists.txt index 42d64d3..10fa72f 100644 --- a/src/signalrclient/CMakeLists.txt +++ b/src/signalrclient/CMakeLists.txt -@@ -58,10 +58,6 @@ else() +@@ -58,10 +58,10 @@ else() target_compile_options(signalrclient PRIVATE -Wall) endif() - # GCC on OSX has a bug with exceptions and no-rtti that can cause crashes - if(NOT APPLE) -- target_compile_options(signalrclient PRIVATE -fno-rtti) -- endif() ++ # boost-asio (a dependency) doesn't support fno-rtti anymore ++ if(0) + target_compile_options(signalrclient PRIVATE -fno-rtti) + endif() target_compile_options(signalrclient PRIVATE -Wextra -Wpedantic -Wno-unknown-pragmas) endif()