[arch-commits] Commit in libuhd/trunk (PKGBUILD boost-1.69.patch)

[Evangelos Foutras]

    Date: Tuesday, January 15, 2019 @ 07:39:33
  Author: foutrelis
Revision: 423164

Fix build with boost 1.69

Added:
  libuhd/trunk/boost-1.69.patch
Modified:
  libuhd/trunk/PKGBUILD

------------------+
 PKGBUILD         |    7 +++++--
 boost-1.69.patch |   24 ++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-15 07:37:36 UTC (rev 423163)
+++ PKGBUILD	2019-01-15 07:39:33 UTC (rev 423164)
@@ -13,13 +13,16 @@
 makedepends=('cmake' 'boost' 'python2-mako')
 
 source=("libuhd-$pkgver.tar.gz::https://github.com/EttusResearch/uhd/archive/v$pkgver.tar.gz"
-        'boost-1.67.patch')
+        'boost-1.67.patch'
+        'boost-1.69.patch')
 md5sums=('e7c38546d9dadac41657ee5e53c3f342'
-         '45fcc6feb0ea9b4ae09e4ba7b010864f')
+         '45fcc6feb0ea9b4ae09e4ba7b010864f'
+         'ae53a647b13a9187a3c8b965bfbde2c1')
 
 prepare() {
   cd "$srcdir/uhd-$pkgver"
   patch -Np1 -i ../boost-1.67.patch
+  patch -Np1 -i ../boost-1.69.patch
 }
 
 build() {

Added: boost-1.69.patch
===================================================================
--- boost-1.69.patch	                        (rev 0)
+++ boost-1.69.patch	2019-01-15 07:39:33 UTC (rev 423164)
@@ -0,0 +1,24 @@
+From 5c012cad7858cadcaa85ec295080f3c8b21fdee0 Mon Sep 17 00:00:00 2001
+From: Martin Braun <martin.braun at ettus.com>
+Date: Wed, 9 Jan 2019 09:17:07 -0800
+Subject: [PATCH] lib: experts: Add potentially missing but sometimes inferred
+ include
+
+This adds an include for boost/core/noncopyable.hpp. Without it, builds
+would potentially fail on Boost 1.69++.
+---
+ host/lib/include/uhdlib/experts/expert_nodes.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/host/lib/include/uhdlib/experts/expert_nodes.hpp b/host/lib/include/uhdlib/experts/expert_nodes.hpp
+index 697ca19c3..8fa183835 100644
+--- a/host/lib/include/uhdlib/experts/expert_nodes.hpp
++++ b/host/lib/include/uhdlib/experts/expert_nodes.hpp
+@@ -12,6 +12,7 @@
+ #include <uhd/exception.hpp>
+ #include <uhd/utils/dirty_tracked.hpp>
+ #include <uhd/types/time_spec.hpp>
++#include <boost/core/noncopyable.hpp>
+ #include <boost/function.hpp>
+ #include <boost/thread/recursive_mutex.hpp>
+ #include <boost/thread.hpp>