- fix building with boost 1.69+

- rel 2

diff --git a/boost-1.69.patch b/boost-1.69.patch
new file mode 100644 (file)
index 0000000..f0ae45d
--- /dev/null
+++ b/boost-1.69.patch
@@ -0,0 +1,39 @@
+From 54a2debd94c3e8df3b6f1e579f1db02dae61cbb7 Mon Sep 17 00:00:00 2001
+From: "Mark W. Krentel" <krentel@rice.edu>
+Date: Fri, 1 Feb 2019 13:14:11 -0600
+Subject: [PATCH] Add some explicit casts from boost::tribool to bool for some
+ code in (#541)
+
+Add some explicit casts from boost::tribool to bool for some code in dataflowAPI/rose/util/Message.[Ch].  This was breaking the build when using boost >= 1.69.
+---
+ dataflowAPI/rose/util/Message.C | 2 +-
+ dataflowAPI/rose/util/Message.h | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dataflowAPI/rose/util/Message.C b/dataflowAPI/rose/util/Message.C
+index a8a66ad4c..5e276f97d 100644
+--- a/dataflowAPI/rose/util/Message.C
++++ b/dataflowAPI/rose/util/Message.C
+@@ -1123,7 +1123,7 @@ StreamBuf::bake() {
+         destination_->bakeDestinations(message_.properties(), baked_/*out*/);
+         anyUnbuffered_ = false;
+         for (BakedDestinations::const_iterator bi=baked_.begin(); bi!=baked_.end() && !anyUnbuffered_; ++bi)
+-            anyUnbuffered_ = !bi->second.isBuffered;
++            anyUnbuffered_ = static_cast<bool>(!bi->second.isBuffered);
+         isBaked_ = true;
+     }
+ }
+diff --git a/dataflowAPI/rose/util/Message.h b/dataflowAPI/rose/util/Message.h
+index 816f68d2e..03592cb97 100644
+--- a/dataflowAPI/rose/util/Message.h
++++ b/dataflowAPI/rose/util/Message.h
+@@ -386,7 +386,8 @@ struct SAWYER_EXPORT ColorSpec {
+     ColorSpec(AnsiColor fg, AnsiColor bg, bool bold): foreground(fg), background(bg), bold(bold) {}
+ 
+     /** Returns true if this object is in its default-constructed state. */
+-    bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background && !bold; }
++    bool isDefault() const { return COLOR_DEFAULT==foreground && COLOR_DEFAULT==background
++                                    && static_cast<bool>(!bold); }
+ };
+ 
+ /** Colors to use for each message importance.

diff --git a/dyninst.spec b/dyninst.spec
index 4103b3c3d3946e46abee5b57cdf291d9d057fa7a..2cb45b2cb9bd75b3513212135456aac4d97e952d 100644 (file)
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -2,7 +2,7 @@ Summary:        API for Run-time Code Generation
 Summary(pl.UTF-8):     API do generowania kodu w czasie działania
 Name:          dyninst
 Version:       9.3.2
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 # http://www.dyninst.org/downloads/dyninst-9.x
@@ -12,6 +12,7 @@ Source0:      https://github.com/dyninst/dyninst/archive/v%{version}/%{name}-%{versio
 Patch0:                %{name}-libname.patch
 Patch1:                %{name}-x32.patch
 Patch2:                %{name}-types.patch
+Patch3:                boost-1.69.patch
 URL:           http://www.dyninst.org/dyninst
 # libiberty
 BuildRequires: binutils-devel
@@ -89,6 +90,7 @@ Dokumentacja do bibliotek dyninst.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %cmake . \