summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPhilip Balister <philip@opensdr.com>2012-04-11 23:11:31 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-12 09:01:11 +0200
commit189f61dc4693470d0bfd0ac2a71d11d94e9dfeb7 (patch)
treed7a5e273995da6c5543242092dcfab999d43a84f /meta-oe
parent12deef7ad4b2c84db0e2c1b6686994929824c244 (diff)
downloadmeta-openembedded-189f61dc4693470d0bfd0ac2a71d11d94e9dfeb7.tar.gz
gnuradio : Remove old files.
Left the buildsys patch for now. It does not apply, but I have only built this with gcc-4.6 from toolchain layer, not gcc from Angstrom. The patch does not apply, but I am saving it to remind me how to fix the problem. Signed-off-by: Philip Balister <philip@opensdr.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-connectivity/gnuradio/gnuradio.inc48
-rw-r--r--meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch42
2 files changed, 0 insertions, 90 deletions
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc b/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
deleted file mode 100644
index 144d58848..000000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio.inc
+++ /dev/null
@@ -1,48 +0,0 @@
1DESCRIPTION = "GNU Radio"
2HOMEPAGE = "http://gnuradio.org"
3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5
6DEPENDS = "uhd virtual/libsdl gsl guile-native fftwf python alsa-lib boost cppunit swig-native python-numpy"
7
8INC_PR = "r1"
9
10inherit distutils-base autotools pkgconfig
11
12export BUILD_SYS
13export HOST_SYS="${MULTIMACH_TARGET_SYS}"
14
15EXTRA_OECONF = " \
16 --program-prefix= \
17 --disable-gr-atsc \
18 --enable-gr-audio-alsa \
19 --disable-gr-audio-jack \
20 --disable-html-docs \
21 --with-boost=${STAGING_DIR_TARGET}/usr \
22 --disable-usrp1 \
23 --disable-usrp2 \
24 --with-pythondir=${PYTHON_SITEPACKAGES_DIR} \
25 PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \
26"
27
28RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils \
29 python-shell python-pickle python-compiler python-pkgutil python-pydoc python-mmap \
30 python-netclient python-unittest python-difflib python-pprint python-numpy \
31"
32
33PACKAGES =+ "\
34 ${PN}-examples \
35 ${PN}-grc \
36 ${PN}-conf \
37"
38
39FILES_${PN}-examples = "${datadir}/gnuradio/examples"
40FILES_${PN}-grc = "${datadir}/gnuradio/grc"
41FILES_${PN}-conf = "${sysconfdir}/gnuradio"
42
43FILES_${PN} += "${datadir}/gnuradio"
44FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/*"
45FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/gnuradio/.debug \
46 ${PYTHON_SITEPACKAGES_DIR}/gnuradio/*/.debug \
47 "
48
diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch b/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch
deleted file mode 100644
index e2f674b75..000000000
--- a/meta-oe/recipes-connectivity/gnuradio/gnuradio/0001-volk-Remove-all-traces-of-volk-from-configure-for-OE.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 857c38eb8201e2a34b524fcabea21b1accbdb288 Mon Sep 17 00:00:00 2001
2From: Philip Balister <philip@opensdr.com>
3Date: Fri, 13 May 2011 12:26:14 -0400
4Subject: [PATCH] volk : Remove all traces of volk from configure for OE builds.
5
6Signed-off-by: Philip Balister <philip@opensdr.com>
7---
8 Makefile.common | 4 ++--
9 configure.ac | 2 +-
10 2 files changed, 3 insertions(+), 3 deletions(-)
11
12diff --git a/Makefile.common b/Makefile.common
13index 20b8a78..aeda1dd 100644
14--- a/Makefile.common
15+++ b/Makefile.common
16@@ -92,8 +92,8 @@ GRUEL_INCLUDES = @gruel_INCLUDES@
17 GRUEL_LA = @gruel_LA@
18
19 # How to link in the VOLK library from inside the tree
20-VOLK_INCLUDES = @volk_INCLUDES@
21-VOLK_LA = @volk_LA@
22+#VOLK_INCLUDES = @volk_INCLUDES@
23+#VOLK_LA = @volk_LA@
24
25 # How to link in the USRP library from inside the tree
26 USRP_INCLUDES = @usrp_INCLUDES@
27diff --git a/configure.ac b/configure.ac
28index 73ebbd6..e5cf7a2 100644
29--- a/configure.ac
30+++ b/configure.ac
31@@ -349,7 +349,7 @@ AC_ARG_ENABLE(
32
33 build_dirs="config"
34 GRC_GRUEL dnl must come first
35-GRC_VOLK
36+dnl GRC_VOLK
37 GRC_GCELL
38 GRC_GNURADIO_CORE
39 GRC_USRP
40--
411.7.3.4
42