From 1e1bda980234632aacbbb31d8aee36bd74fc75f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Wed, 31 Oct 2018 15:12:55 +0100 Subject: [PATCH] Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake --- ...e-configversion-compatibility-anynewerversion.patch | 10 +++++++--- websocketpp.spec | 8 +++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch b/websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch index 1ddc05c..983b73d 100644 --- a/websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch +++ b/websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch @@ -1,7 +1,11 @@ ---- a/CMakeLists.txt 2018-07-16 14:40:53.000000000 +0200 -+++ b/CMakeLists.txt 2018-07-26 16:41:28.356321007 +0200 -@@ -268,7 +268,7 @@ +--- a/CMakeLists.txt 2018-10-31 13:58:03.000000000 +0100 ++++ b/CMakeLists.txt 2018-10-31 14:21:06.251424022 +0100 +@@ -266,9 +266,11 @@ + INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}" + NO_CHECK_REQUIRED_COMPONENTS_MACRO ) ++# disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P ++set (CMAKE_SIZEOF_VOID_P "") write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" VERSION ${WEBSOCKETPP_VERSION} - COMPATIBILITY ExactVersion) diff --git a/websocketpp.spec b/websocketpp.spec index da7f5bf..4963033 100644 --- a/websocketpp.spec +++ b/websocketpp.spec @@ -2,7 +2,7 @@ Name: websocketpp Summary: C++ WebSocket Protocol Library Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Url: https://www.zaphoyd.com/websocketpp @@ -17,11 +17,13 @@ Patch1: websocketpp-0.7.0-cmake_noarch.patch # https://cmake.org/cmake/help/v3.0/module/CMakePackageConfigHelpers.html # Fixes build failure of tomahawk, which uses "find_package(websocketpp 0.2.99 REQUIRED)" # PR submitted upstream: https://github.com/zaphoyd/websocketpp/pull/740 +# Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P Patch2: websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch # Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers Patch3: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch + BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ @@ -81,6 +83,10 @@ make test -C %{_target_platform} %changelog +* Wed Oct 31 2018 Wolfgang Stöggl - 0.8.1-2 +- Update websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch + Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake + * Thu Jul 26 2018 Wolfgang Stöggl - 0.8.1-1 - New upstream version - Added websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch