[oe-commits] Michael 'Mickey' Lauer : gnuradion: fix reference to python includedir flags.
GIT User account
git at amethyst.openembedded.net
Mon Jan 26 23:59:13 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 43109b0a85e5dcc855377adb0396b3bba6578918
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=43109b0a85e5dcc855377adb0396b3bba6578918
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date: Tue Jan 27 00:57:05 2009 +0100
gnuradion: fix reference to python includedir flags.
NOTE: PYTHON_DIR only equals 'python<version>'.
---
packages/gnuradio/gnuradio.inc | 57 ++++++++++++++++++-----------------
packages/gnuradio/gnuradio_3.0.4.bb | 2 +-
packages/gnuradio/gnuradio_3.1.2.bb | 2 +-
packages/gnuradio/gnuradio_3.1.3.bb | 2 +-
4 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/packages/gnuradio/gnuradio.inc b/packages/gnuradio/gnuradio.inc
index 7df01a3..65cfa40 100644
--- a/packages/gnuradio/gnuradio.inc
+++ b/packages/gnuradio/gnuradio.inc
@@ -2,14 +2,7 @@ DESCRIPTION = "GNU Radio"
SECTION = "apps"
PRIORITY = "optional"
LICENSE = "GPL"
-DEPENDS = " guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy"
-
-RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils \
- python-shell python-pickle python-compiler python-pkgutil python-pydoc python-mmap \
- python-netclient python-unittest python-difflib python-pprint python-numpy \
- "
-
-RDEPENDS_gnuradio-usrp = "python-core"
+DEPENDS = "guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy"
inherit distutils-base autotools pkgconfig
@@ -19,34 +12,42 @@ export HOST_SYS=${MULTIMACH_TARGET_SYS}
CXXFLAGS_powerpc += "-lstdc++"
EXTRA_OECONF = " \
- --disable-gr-atsc \
- --enable-gr-video-sdl \
- --enable-gr-audio-alsa \
- --enable-gr-audio-jack \
- --enable-gr-audio-oss \
- --enable-mblock \
- --disable-html-docs \
- PYTHON_CPPFLAGS=-I${PYTHON_DIR} \
- "
+ --disable-gr-atsc \
+ --enable-gr-video-sdl \
+ --enable-gr-audio-alsa \
+ --enable-gr-audio-jack \
+ --enable-gr-audio-oss \
+ --enable-mblock \
+ --disable-html-docs \
+ PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \
+"
do_configure_prepend() {
-if [ -e ${WORKDIR}/acinclude.m4 ] ; then
- cp ${WORKDIR}/acinclude.m4 ${S}
-fi
+ if [ -e ${WORKDIR}/acinclude.m4 ] ; then
+ cp ${WORKDIR}/acinclude.m4 ${S}
+ fi
}
do_configure_append() {
- find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
+ find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
}
-PACKAGES =+ "libpmt libpmt-qa \
- libmblock libmblock-qa \
- libgr-audio-alsa libgr-audio-oss libgr-audio-jack\
- libusrp libusrp-inband libusrp-inband-qa \
- libgromnithread \
- libgnuradio-core libgnuradio-core-qa \
- gnuradio-usrp-dbg gnuradio-usrp gnuradio-examples"
+RDEPENDS_${PN} = "python-core python-audio python-threading python-codecs python-lang python-textutils \
+ python-shell python-pickle python-compiler python-pkgutil python-pydoc python-mmap \
+ python-netclient python-unittest python-difflib python-pprint python-numpy \
+"
+
+RDEPENDS_gnuradio-usrp = "python-core"
+PACKAGES =+ "\
+ libpmt libpmt-qa \
+ libmblock libmblock-qa \
+ libgr-audio-alsa libgr-audio-oss libgr-audio-jack\
+ libusrp libusrp-inband libusrp-inband-qa \
+ libgromnithread \
+ libgnuradio-core libgnuradio-core-qa \
+ gnuradio-usrp-dbg gnuradio-usrp gnuradio-examples \
+"
FILES_gnuradio-examples = "${datadir}/gnuradio/examples"
diff --git a/packages/gnuradio/gnuradio_3.0.4.bb b/packages/gnuradio/gnuradio_3.0.4.bb
index 9bf605b..8a3e25b 100644
--- a/packages/gnuradio/gnuradio_3.0.4.bb
+++ b/packages/gnuradio/gnuradio_3.0.4.bb
@@ -1,6 +1,6 @@
require gnuradio.inc
-PR = "r3"
+PR = "r4"
SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
file://no-trellis-doc.patch;patch=1 \
diff --git a/packages/gnuradio/gnuradio_3.1.2.bb b/packages/gnuradio/gnuradio_3.1.2.bb
index 62e5f3c..3a6b977 100644
--- a/packages/gnuradio/gnuradio_3.1.2.bb
+++ b/packages/gnuradio/gnuradio_3.1.2.bb
@@ -1,6 +1,6 @@
require gnuradio.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
file://no-trellis-doc.patch;patch=1 \
diff --git a/packages/gnuradio/gnuradio_3.1.3.bb b/packages/gnuradio/gnuradio_3.1.3.bb
index b6b7d4a..17089dd 100644
--- a/packages/gnuradio/gnuradio_3.1.3.bb
+++ b/packages/gnuradio/gnuradio_3.1.3.bb
@@ -1,6 +1,6 @@
require gnuradio.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-${PV}.tar.gz \
# file://gnuradio-libusb.patch;patch=1 \
More information about the Openembedded-commits
mailing list