aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/microsoft-signalr/CONTROL3
-rw-r--r--ports/microsoft-signalr/portfile.cmake3
-rw-r--r--ports/microsoft-signalr/remove-fno-rtti-compile-option.patch17
3 files changed, 21 insertions, 2 deletions
diff --git a/ports/microsoft-signalr/CONTROL b/ports/microsoft-signalr/CONTROL
index 0cec60bf9..6b0f314a3 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 e566f594e..ff5b6074c 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 000000000..4c2aac20c
--- /dev/null
+++ b/ports/microsoft-signalr/remove-fno-rtti-compile-option.patch
@@ -0,0 +1,17 @@
+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,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)
++ # 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()
+