summaryrefslogtreecommitdiff
path: root/development/gnuradio
diff options
context:
space:
mode:
Diffstat (limited to 'development/gnuradio')
-rw-r--r--development/gnuradio/9aa0f07693053d44aaaad8e54dd5250909705c02.patch172
-rw-r--r--development/gnuradio/cxx_abi.patch10
-rw-r--r--development/gnuradio/gnuradio.SlackBuild16
-rw-r--r--development/gnuradio/gnuradio.info6
4 files changed, 21 insertions, 183 deletions
diff --git a/development/gnuradio/9aa0f07693053d44aaaad8e54dd5250909705c02.patch b/development/gnuradio/9aa0f07693053d44aaaad8e54dd5250909705c02.patch
deleted file mode 100644
index b7330af928..0000000000
--- a/development/gnuradio/9aa0f07693053d44aaaad8e54dd5250909705c02.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 9aa0f07693053d44aaaad8e54dd5250909705c02 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
-Date: Wed, 24 Feb 2016 12:25:22 +0100
-Subject: [PATCH] The fix for compilation with cmake-3.5
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
----
- apps/CMakeLists.txt | 12 ++++++------
- lib/CMakeLists.txt | 48 ++++++++++++++++++++++++------------------------
- 2 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index 74ed18d..f9ef6e0 100644
---- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -19,23 +19,23 @@
- # Setup profiler
- ########################################################################
- if(MSVC)
-- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
- endif(MSVC)
-
- include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
-- ${CMAKE_SOURCE_DIR}/include
-- ${CMAKE_BINARY_DIR}/include
-- ${CMAKE_SOURCE_DIR}/lib
-- ${CMAKE_BINARY_DIR}/lib
-+ ${PROJECT_SOURCE_DIR}/include
-+ ${PROJECT_BINARY_DIR}/include
-+ ${PROJECT_SOURCE_DIR}/lib
-+ ${PROJECT_BINARY_DIR}/lib
- ${Boost_INCLUDE_DIRS}
- )
-
- # MAKE volk_profile
- add_executable(volk_profile
- ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
-- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
-+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
- )
-
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index 35b67dc..f00200a 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -90,7 +90,7 @@ endif()
- ########################################################################
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
- --mode "arch_flags" --compiler "${COMPILER_NAME}"
- OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -278,7 +278,7 @@ message(STATUS "Available architectures: ${available_archs}")
- ########################################################################
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
- --mode "machines" --archs "${available_archs}"
- OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${available_machines}")
- ########################################################################
-
- #dependencies are all python, xml, and header implementation files
--file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
--file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
--file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
-+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
-+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
-+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
-
- macro(gen_template tmpl output)
- list(APPEND volk_gen_sources ${output})
-@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
- OUTPUT ${output}
- DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
- COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
-+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
- --input ${tmpl} --output ${output} ${ARGN}
- )
- endmacro(gen_template)
-
--make_directory(${CMAKE_BINARY_DIR}/include/volk)
-+make_directory(${PROJECT_BINARY_DIR}/include/volk)
-
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
-
- set(BASE_CFLAGS NONE)
- string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
-@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:::${CMAKE_C_FLAGS_${GRCBTU}} ${CMAKE_C_FL
- foreach(machine_name ${available_machines})
- #generate machine source
- set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
-- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
-+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
-
- #determine machine flags
- execute_process(
- COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
- --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
- OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_INFO})
- # Set local include directories first
- ########################################################################
- include_directories(
-- ${CMAKE_BINARY_DIR}/include
-- ${CMAKE_SOURCE_DIR}/include
-- ${CMAKE_SOURCE_DIR}/kernels
-+ ${PROJECT_BINARY_DIR}/include
-+ ${PROJECT_SOURCE_DIR}/include
-+ ${PROJECT_SOURCE_DIR}/kernels
- ${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
- )
-@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
- # setup architecture specific assembler flags
- set(ARCH_ASM_FLAGS "-mfpu=neon -g")
- # then add the files
-- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
-- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
-+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
-+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
- foreach(asm_file ${asm_files})
- list(APPEND volk_sources ${asm_file})
- message(STATUS "Adding source file: ${asm_file}")
-@@ -453,7 +453,7 @@ if(ORC_FOUND)
- list(APPEND volk_libraries ${ORC_LIBRARIES})
-
- #setup orc functions
-- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
-+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
- foreach(orc_file ${orc_files})
-
- #extract the name for the generated c source from the orc file
-@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machine_defs}")
-
- if(MSVC)
- #add compatibility includes for stdint types
-- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
- add_definitions(-DHAVE_CONFIG_H)
- #compile the sources as C++ due to the lack of complex.h under MSVC
- set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
diff --git a/development/gnuradio/cxx_abi.patch b/development/gnuradio/cxx_abi.patch
new file mode 100644
index 0000000000..80cb562a4a
--- /dev/null
+++ b/development/gnuradio/cxx_abi.patch
@@ -0,0 +1,10 @@
+--- gnuradio-3.7.10.1.orig/volk/CMakeLists.txt 2017-02-03 09:52:01.876198540 -0800
++++ gnuradio-3.7.10.1/volk/CMakeLists.txt 2017-02-03 09:48:17.651151087 -0800
+@@ -27,7 +27,6 @@
+
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+-add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
+
+ set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
+ set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild
index 18ac2569c8..94adb84e26 100644
--- a/development/gnuradio/gnuradio.SlackBuild
+++ b/development/gnuradio/gnuradio.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for gnuradio
# Copyright 2013 Georgi Kolev, Bulgaria
-# Copyright 2015 Panagiotis Nikolaou, Karlovasi Samos, Gr
+# Copyright 2015, 2016, 2017 Panagiotis Nikolaou, Culver City, CA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=gnuradio
-VERSION=${VERSION:-3.7.8.1}
+VERSION=${VERSION:-3.7.10.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,9 +73,9 @@ find -L . \
# install docs in the right place
sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt
-# Fix build with cmake-3.5
-# https://github.com/gnuradio/volk/pull/65
-patch -d volk -p1 < $CWD/9aa0f07693053d44aaaad8e54dd5250909705c02.patch
+# Fix build with boost
+# https://github.com/gnuradio/volk/commit/e5fec2aaacc8a130bcff84f1f3bbd9718250f029
+patch -p1 < $CWD/cxx_abi.patch
mkdir -p build
cd build
diff --git a/development/gnuradio/gnuradio.info b/development/gnuradio/gnuradio.info
index 3b44ff53dc..01f9e7c152 100644
--- a/development/gnuradio/gnuradio.info
+++ b/development/gnuradio/gnuradio.info
@@ -1,8 +1,8 @@
PRGNAM="gnuradio"
-VERSION="3.7.8.1"
+VERSION="3.7.10.1"
HOMEPAGE="http://gnuradio.org"
-DOWNLOAD="http://gnuradio.org/releases/gnuradio/gnuradio-3.7.8.1.tar.gz"
-MD5SUM="961d5ba5089f409f0c9e5e5b7f6ee0f2"
+DOWNLOAD="http://gnuradio.org/releases/gnuradio/gnuradio-3.7.10.1.tar.gz"
+MD5SUM="885d637669c2dfc2b005c24e16327c96"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="python-cheetah"
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-19 15:17:26 +0000