Accepting request 497746 from hardware:sdr
1 OBS-URL: https://build.opensuse.org/request/show/497746 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnuradio?expand=0&rev=23
This commit is contained in:
Git OBS Bridge
commit
ca3eb20909
@ -0,0 +1,37 @@
|
||||
From cee483f7851f13e797b75d08934b5d779aca5d49 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Dickens <michael.dickens@ettus.com>
|
||||
Date: Fri, 10 Mar 2017 12:35:05 -0500
|
||||
Subject: [PATCH] gr-fec: switch possible C++11 code from 'constexpr' to just
|
||||
'const'.
|
||||
|
||||
---
|
||||
gr-fec/include/gnuradio/fec/polar_decoder_common.h | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
index 13b25ea19..c160f4b87 100644
|
||||
--- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
|
||||
@@ -28,10 +28,6 @@
|
||||
#include <gnuradio/fec/generic_decoder.h>
|
||||
#include <gnuradio/fec/polar_common.h>
|
||||
|
||||
-#ifndef BOOST_CONSTEXPR_OR_CONST
|
||||
-#define BOOST_CONSTEXPR_OR_CONST const
|
||||
-#endif
|
||||
-
|
||||
namespace gr {
|
||||
namespace fec {
|
||||
namespace code {
|
||||
@@ -68,7 +64,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:
|
||||
--
|
||||
2.12.0
|
||||
|
||||
59
CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
Normal file
59
CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
Normal file
@ -0,0 +1,59 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0ac65fe..0d8b63f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -56,31 +56,33 @@ IF (NOT MSVC)
|
||||
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O2")
|
||||
ENDIF()
|
||||
|
||||
-# Set C/C++ standard for all targets
|
||||
-# NOTE: Starting with cmake v3.1 this should be used:
|
||||
-# set(CMAKE_C_STANDARD 90)
|
||||
-# set(CMAKE_CXX_STANDARD 98)
|
||||
-
|
||||
-IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
- 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")
|
||||
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
|
||||
-ELSE()
|
||||
- message(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
-ENDIF()
|
||||
+# Configure C++ and C standards
|
||||
+IF(CMAKE_VERSION VERSION_LESS "3.1")
|
||||
+ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
|
||||
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
+ ELSE()
|
||||
+ MESSAGE(warning "C++ standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ ENDIF()
|
||||
|
||||
-IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
- 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")
|
||||
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
+ IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
+ 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")
|
||||
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
+ ELSE()
|
||||
+ MESSAGE(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ ENDIF()
|
||||
ELSE()
|
||||
- message(warning "C standard could not be set because compiler is not GNU, Clang or MSVC.")
|
||||
+ SET(CMAKE_C_STANDARD 99)
|
||||
+ SET(CMAKE_CXX_STANDARD 11)
|
||||
ENDIF()
|
||||
|
||||
+
|
||||
# Set cmake policies.
|
||||
# This will suppress developer warnings during the cmake process that can occur
|
||||
# if a newer cmake version than the minimum is used.
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon May 22 20:27:27 UTC 2017 - mardnh@gmx.de
|
||||
|
||||
- Add patches to fix builds on Factory
|
||||
+ 0001-gr-fec-switch-possible-C-11-code-from-constexpr-to-j.patch
|
||||
+ CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 8 00:49:30 UTC 2017 - wk@ire.pw.edu.pl
|
||||
|
||||
|
||||
@ -29,6 +29,8 @@ Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
|
||||
Source1: %{name}-rpmlintrc
|
||||
# http://www.nathanwest.us/grc_to_37.sh
|
||||
Source2: grc_to_37.sh
|
||||
Patch0: CMake-set-C++-standard-to-c++11-and-C-standard-to-C99.diff
|
||||
Patch1: 0001-gr-fec-switch-possible-C-11-code-from-constexpr-to-j.patch
|
||||
BuildRequires: alsa-devel
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cmake
|
||||
@ -185,6 +187,11 @@ This package contains the examples of using GNU Radio depending on wxWidgets.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
# Workaround for Tumbleweed until GNURadio 3.8 is released
|
||||
%if 0%{?suse_version} > 1320
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
# remove buildtime from documentation
|
||||
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in
|
||||
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user