From 763075d479bc5d670286a08ca971137ff9f625c4 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo
Date: Sun, 2 Jul 2017 13:47:31 +0700
Subject: development/gnuradio: Support cppunit 1.14.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 development/gnuradio/gnuradio-cppunit.patch | 72 +++++++++++++++++++++++++++++
 development/gnuradio/gnuradio.SlackBuild    |  6 ++-
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 development/gnuradio/gnuradio-cppunit.patch

(limited to 'development/gnuradio')

diff --git a/development/gnuradio/gnuradio-cppunit.patch b/development/gnuradio/gnuradio-cppunit.patch
new file mode 100644
index 0000000000..01f58f396d
--- /dev/null
+++ b/development/gnuradio/gnuradio-cppunit.patch
@@ -0,0 +1,72 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ac65fe..71378aa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,7 +62,7 @@ ENDIF()
+ # set(CMAKE_CXX_STANDARD 98)
+ 
+ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
++#    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+@@ -72,7 +72,7 @@ ELSE()
+ ENDIF()
+ 
+ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
++#    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h
+index 58a6f02..6020e47 100644
+--- a/gnuradio-runtime/lib/math/qa_fxpt.h
++++ b/gnuradio-runtime/lib/math/qa_fxpt.h
+@@ -25,6 +25,7 @@
+ 
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/TestCase.h>
++#include <memory>
+ 
+ class qa_fxpt : public CppUnit::TestCase
+ {
+diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
+index 1b2cdae..1755904 100644
+--- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h
++++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
+@@ -25,6 +25,7 @@
+ 
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/TestCase.h>
++#include <memory>
+ 
+ class qa_fxpt_nco : public CppUnit::TestCase
+ {
+diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
+index 72693f3..76e0b6d 100644
+--- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h
++++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
+@@ -25,6 +25,7 @@
+ 
+ #include <cppunit/extensions/HelperMacros.h>
+ #include <cppunit/TestCase.h>
++#include <memory>
+ 
+ class qa_fxpt_vco : public CppUnit::TestCase
+ {
+diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
+index 13b25ea..8a3d65d 100644
+--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
++++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
+@@ -68,7 +68,7 @@ namespace gr {
+         bool set_frame_size(unsigned int frame_size){return false;};
+ 
+       private:
+-        static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
++        static const float D_LLR_FACTOR;
+         unsigned int d_frozen_bit_counter;
+ 
+       protected:
+
diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild
index a5cf90d496..b32e7457c6 100644
--- a/development/gnuradio/gnuradio.SlackBuild
+++ b/development/gnuradio/gnuradio.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=gnuradio
 VERSION=${VERSION:-3.7.11}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,11 +77,13 @@ sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt
 # https://github.com/gnuradio/volk/commit/e5fec2aaacc8a130bcff84f1f3bbd9718250f029
 patch -p1 < $CWD/cxx_abi.patch
 
+patch -p1 < $CWD/gnuradio-cppunit.patch
+
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fpermissive" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
-- 
cgit v1.2.3