- Ignore openssl-1_0_0 for build as temporary workaround for
Factory unresolvable state OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=12
This commit is contained in:
Martin Pluskal
Git OBS Bridge
parent
edf7316b9c
commit
3539c745cf
@ -1,37 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
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,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 12 15:52:26 UTC 2017 - mpluskal@suse.com
|
||||
|
||||
- Ignore openssl-1_0_0 for build as temporary workaround for
|
||||
Factory unresolvable state
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 22 20:27:27 UTC 2017 - mardnh@gmx.de
|
||||
|
||||
|
||||
@ -16,15 +16,15 @@
|
||||
#
|
||||
|
||||
|
||||
%define sover 3_7_11-0_0_0
|
||||
%define sover_volk 1_3
|
||||
Name: gnuradio
|
||||
Version: 3.7.11
|
||||
Release: 0
|
||||
%define sover 3_7_11-0_0_0
|
||||
%define sover_volk 1_3
|
||||
Summary: GNU software radio
|
||||
License: GPL-3.0+
|
||||
Group: Productivity/Hamradio/Other
|
||||
Url: http://gnuradio.org
|
||||
URL: http://gnuradio.org
|
||||
Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz
|
||||
Source1: %{name}-rpmlintrc
|
||||
# http://www.nathanwest.us/grc_to_37.sh
|
||||
@ -44,7 +44,7 @@ BuildRequires: libSDL-devel
|
||||
BuildRequires: libjack-devel
|
||||
BuildRequires: libxslt-python
|
||||
BuildRequires: orc
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: portaudio-devel
|
||||
BuildRequires: python-Cheetah
|
||||
BuildRequires: python-Sphinx
|
||||
@ -52,11 +52,6 @@ BuildRequires: python-gtk
|
||||
BuildRequires: python-lxml
|
||||
BuildRequires: python-numpy
|
||||
BuildRequires: python-qt4-devel
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: python-wxWidgets-3_0
|
||||
%else
|
||||
BuildRequires: python-wxWidgets
|
||||
%endif
|
||||
BuildRequires: qwt6-devel
|
||||
BuildRequires: swig
|
||||
BuildRequires: texlive-dvips
|
||||
@ -65,13 +60,19 @@ BuildRequires: uhd-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(libusb-1.0)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
# Workaround for openssl migration
|
||||
#!BuildIgnore: openssl-1_0_0
|
||||
Requires: python
|
||||
Requires: python-Cheetah
|
||||
Requires: python-gtk
|
||||
Requires: python-lxml
|
||||
Requires: python-numpy
|
||||
Requires: python-qt4
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: python-wxWidgets-3_0
|
||||
%else
|
||||
BuildRequires: python-wxWidgets
|
||||
%endif
|
||||
|
||||
%description
|
||||
GNU Radio is a collection of software that when combined with minimal
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user