Accepting request 629912 from home:adamm:branches:Base:System

- boost_168.patch: fix build with Boost 1.68. This version of Boost
  removes compatibility SHA1 header from Uuid library. (bsc#1105088)

OBS-URL: https://build.opensuse.org/request/show/629912
OBS-URL: https://build.opensuse.org/package/show/Base:System/thin-provisioning-tools?expand=0&rev=40
This commit is contained in:
Martin Pluskal 2018-08-17 12:52:35 +00:00 committed by Git OBS Bridge
parent f9a6ffb4cc
commit 9d233f8c56
3 changed files with 27 additions and 1 deletions

19
boost_168.patch Normal file
View File

@ -0,0 +1,19 @@
Index: thin-provisioning-tools-0.7.6/thin-provisioning/thin_show_duplicates.cc
===================================================================
--- thin-provisioning-tools-0.7.6.orig/thin-provisioning/thin_show_duplicates.cc
+++ thin-provisioning-tools-0.7.6/thin-provisioning/thin_show_duplicates.cc
@@ -40,7 +40,14 @@
#include "thin-provisioning/superblock.h"
#include "thin-provisioning/variable_chunk_stream.h"
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 106800
+#include <boost/uuid/detail/sha1.hpp>
+#else
#include <boost/uuid/sha1.hpp>
+#endif
+
#include <boost/lexical_cast.hpp>
#include <boost/optional.hpp>
#include <deque>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 17 11:20:11 UTC 2018 - adam.majer@suse.de
- boost_168.patch: fix build with Boost 1.68. This version of Boost
removes compatibility SHA1 header from Uuid library. (bsc#1105088)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 31 13:57:20 UTC 2018 - mpluskal@suse.com Thu May 31 13:57:20 UTC 2018 - mpluskal@suse.com

View File

@ -24,6 +24,7 @@ License: GPL-3.0-only
Group: System/Base Group: System/Base
URL: https://github.com/jthornber/thin-provisioning-tools/ URL: https://github.com/jthornber/thin-provisioning-tools/
Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: boost_168.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -41,7 +42,7 @@ Conflicts: device-mapper < 1.02.115
A suite of tools for thin provisioning on Linux. A suite of tools for thin provisioning on Linux.
%prep %prep
%autosetup %autosetup -p1
%build %build
autoreconf -fiv autoreconf -fiv