From 4f0ede04cc2e247464b764201ea84d4eca1138f7 Mon Sep 17 00:00:00 2001
From: William Cohen <wcohen@redhat.com>
Date: Mon, 4 Feb 2019 13:18:16 -0500
Subject: [PATCH] Fix FTBFS due to move to boost 1.69 and tribool changes.

---
 dyninst-10.0.0-tribool.patch | 35 +++++++++++++++++++++++++++++++++++
 dyninst.spec                 |  7 ++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 dyninst-10.0.0-tribool.patch

diff --git a/dyninst-10.0.0-tribool.patch b/dyninst-10.0.0-tribool.patch
new file mode 100644
index 0000000..0caec2f
--- /dev/null
+++ b/dyninst-10.0.0-tribool.patch
@@ -0,0 +1,35 @@
+commit 54a2debd94c3e8df3b6f1e579f1db02dae61cbb7
+Author: Mark W. Krentel <krentel@rice.edu>
+Date:   Fri Feb 1 13:14:11 2019 -0600
+
+    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.
+
+diff --git a/dataflowAPI/rose/util/Message.C b/dataflowAPI/rose/util/Message.C
+index a8a66ad4c..5e276f97d 100644
+--- ./dyninst-10.0.0/dataflowAPI/rose/util/Message.C
++++ ./dyninst-10.0.0/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
+--- ./dyninst-10.0.0/dataflowAPI/rose/util/Message.h
++++ ./dyninst-10.0.0/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 fe52640..e07ffc5 100644
--- a/dyninst.spec
+++ b/dyninst.spec
@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://www.dyninst.org
 Version: 10.0.0
 # Dyninst only has full support for a few architectures.
@@ -16,6 +16,7 @@ Source1: http://scox.fedorapeople.org/testsuite-9.4.0.tar.gz
 Patch1: dyninst-10.0.0-examples.patch
 Patch2: dyninst-10.0.0-doc.patch
 Patch3: dyninst-10.0.0-result.patch
+Patch4: dyninst-10.0.0-tribool.patch
 
 %global dyninst_base dyninst-%{version}
 # Explicit version since it does not match the source version
@@ -90,6 +91,7 @@ making sure that dyninst works properly.
 %patch1 -p1 -b.ex
 %patch2 -p1 -b.doc
 %patch3 -p1 -b.result
+%patch4 -p1 -b.tribool
 
 # cotire seems to cause non-deterministic gcc errors
 # https://bugzilla.redhat.com/show_bug.cgi?id=1420551
@@ -201,6 +203,9 @@ find %{buildroot}%{_libdir}/dyninst/testsuite/ \
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Mon Feb 4  2019 William Cohen <wcohen@redhat.com> - 10.0.0-7
+- Fix FTBFS due to move to boost 1.69 and tribool changes.
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild