From 52035f6d5c0dcf41e1635c9bb43de3555cdf4575 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sun, 18 Oct 2009 15:07:13 -0400 Subject: gnuradio : Newer versions of GNU Radio will not need to build private copies of libusb-0.12. --- recipes/gnuradio/gnuradio-libusb-compat.inc | 110 ++++++++++++++++++++++++++++ recipes/gnuradio/gnuradio.inc | 110 ---------------------------- recipes/gnuradio/gnuradio_3.1.3.bb | 2 +- recipes/gnuradio/gnuradio_3.2.0.bb | 2 +- recipes/gnuradio/gnuradio_3.2.1.bb | 2 +- 5 files changed, 113 insertions(+), 113 deletions(-) create mode 100644 recipes/gnuradio/gnuradio-libusb-compat.inc delete mode 100644 recipes/gnuradio/gnuradio.inc (limited to 'recipes/gnuradio') diff --git a/recipes/gnuradio/gnuradio-libusb-compat.inc b/recipes/gnuradio/gnuradio-libusb-compat.inc new file mode 100644 index 0000000000..8a0ca54726 --- /dev/null +++ b/recipes/gnuradio/gnuradio-libusb-compat.inc @@ -0,0 +1,110 @@ +DESCRIPTION = "GNU Radio" +SECTION = "apps" +PRIORITY = "optional" +LICENSE = "GPLv3" +DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" +INC_PR = "r7" + +inherit distutils-base autotools autotools_stage pkgconfig + +export BUILD_SYS +export HOST_SYS=${MULTIMACH_TARGET_SYS} + +CXXFLAGS_powerpc += "-lstdc++" + +EXTRA_OECONF = " \ + --program-prefix= \ + ${GR_CPU_SELECTION} \ + --disable-gr-atsc \ + --enable-gr-video-sdl \ + --enable-gr-audio-alsa \ + --enable-gr-audio-jack \ + --enable-gr-audio-oss \ + --enable-mblock \ + --disable-html-docs \ + --with-pythondir=/usr/lib/${PYTHON_DIR}/site-packages \ + PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \ +" + +GR_CPU_SELECTION_armv7a = " --with-md-cpu=arm " + +# This is an awful hack to allow GNU Radio to use libusb-0.12, regardless +# of what is used by the rest of OE + +export USB_CFLAGS="" +export USB_LIBS="-L${WORKDIR}/libusb-0.1.12/.libs/ -l:libusb-gnur.a" + +do_buildlibusb() { + cd ${WORKDIR}/libusb-0.1.12 + sed -e 's/AC_LANG_CPLUSPLUS/AC_PROG_CXX/' -i configure.in + sed -e s:tests::g -i Makefile.am + sed -e s:tests::g -i Makefile.in || true + ./configure --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-shared --disable-build-docs + make + mv .libs/libusb.a .libs/libusb-gnur.a || true + cd ${WORKDIR} +} + +addtask buildlibusb before do_configure after do_unpack + +do_buildlibusb[deptask] = "do_populate_staging" + +do_configure_prepend() { + 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 +} + +do_stage() { + autotools_stage_all + sed -i s,-l:libusb-gnur.a,,g ${STAGING_LIBDIR}/libusrp.la +} + +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" + +FILES_libpmt = "${libdir}/libpmt.so" +FILES_libpmt-qa = "${libdir}/libpmt-qa.so" +FILES_libmblock = "${libdir}/libmblock.so" +FILES_libmblock-qa = "${libdir}/libmblock-qa.so" +FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so ${sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf" +FILES_libgr-audio-oss = "${libdir}/libgr_audio_oss.so ${sysconfdir}/gnuradio/conf.d/gr-audio-oss.conf" +FILES_libgr-audio-jack = "${libdir}/libgr_audio_jack.so ${sysconfdir}/gnuradio/conf.d/gr-audio-jack.conf" + + +FILES_libusrp = "${libdir}/libusrp.so.*" +FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*" +FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so" +FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.* ${sysconfdir}/gnuradio/conf.d/*core*" +FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*" +FILES_libgromnithread = "${libdir}/libgromnithread.so*" + +FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \ + ${libdir}/python*/site-packages/gnuradio/*/.debug \ + " + +FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrp/* \ + ${bindir}/usrp* \ + ${datadir}/usrp/*/*" +FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrp/.debug" diff --git a/recipes/gnuradio/gnuradio.inc b/recipes/gnuradio/gnuradio.inc deleted file mode 100644 index 8a0ca54726..0000000000 --- a/recipes/gnuradio/gnuradio.inc +++ /dev/null @@ -1,110 +0,0 @@ -DESCRIPTION = "GNU Radio" -SECTION = "apps" -PRIORITY = "optional" -LICENSE = "GPLv3" -DEPENDS = "virtual/libusb0 guile-native fftwf python virtual/libsdl alsa-lib jack boost cppunit sdcc-native swig-native python-numpy" -INC_PR = "r7" - -inherit distutils-base autotools autotools_stage pkgconfig - -export BUILD_SYS -export HOST_SYS=${MULTIMACH_TARGET_SYS} - -CXXFLAGS_powerpc += "-lstdc++" - -EXTRA_OECONF = " \ - --program-prefix= \ - ${GR_CPU_SELECTION} \ - --disable-gr-atsc \ - --enable-gr-video-sdl \ - --enable-gr-audio-alsa \ - --enable-gr-audio-jack \ - --enable-gr-audio-oss \ - --enable-mblock \ - --disable-html-docs \ - --with-pythondir=/usr/lib/${PYTHON_DIR}/site-packages \ - PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR} \ -" - -GR_CPU_SELECTION_armv7a = " --with-md-cpu=arm " - -# This is an awful hack to allow GNU Radio to use libusb-0.12, regardless -# of what is used by the rest of OE - -export USB_CFLAGS="" -export USB_LIBS="-L${WORKDIR}/libusb-0.1.12/.libs/ -l:libusb-gnur.a" - -do_buildlibusb() { - cd ${WORKDIR}/libusb-0.1.12 - sed -e 's/AC_LANG_CPLUSPLUS/AC_PROG_CXX/' -i configure.in - sed -e s:tests::g -i Makefile.am - sed -e s:tests::g -i Makefile.in || true - ./configure --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir} --disable-shared --disable-build-docs - make - mv .libs/libusb.a .libs/libusb-gnur.a || true - cd ${WORKDIR} -} - -addtask buildlibusb before do_configure after do_unpack - -do_buildlibusb[deptask] = "do_populate_staging" - -do_configure_prepend() { - 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 -} - -do_stage() { - autotools_stage_all - sed -i s,-l:libusb-gnur.a,,g ${STAGING_LIBDIR}/libusrp.la -} - -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" - -FILES_libpmt = "${libdir}/libpmt.so" -FILES_libpmt-qa = "${libdir}/libpmt-qa.so" -FILES_libmblock = "${libdir}/libmblock.so" -FILES_libmblock-qa = "${libdir}/libmblock-qa.so" -FILES_libgr-audio-alsa = "${libdir}/libgr_audio_alsa.so ${sysconfdir}/gnuradio/conf.d/gr-audio-alsa.conf" -FILES_libgr-audio-oss = "${libdir}/libgr_audio_oss.so ${sysconfdir}/gnuradio/conf.d/gr-audio-oss.conf" -FILES_libgr-audio-jack = "${libdir}/libgr_audio_jack.so ${sysconfdir}/gnuradio/conf.d/gr-audio-jack.conf" - - -FILES_libusrp = "${libdir}/libusrp.so.*" -FILES_libusrp-inband = "${libdir}/libusrp_inband.so.*" -FILES_libusrp-inband-qa = "${libdir}/libusrp_inband-qa.so" -FILES_libgnuradio-core = "${libdir}/libgnuradio-core.so.* ${sysconfdir}/gnuradio/conf.d/*core*" -FILES_libgnuradio-core-qa = "${libdir}/libgnuradio-core-qa.so.*" -FILES_libgromnithread = "${libdir}/libgromnithread.so*" - -FILES_${PN} += "${libdir}/python*/site-packages/gnuradio/*" -FILES_${PN}-dbg += "${libdir}/python*/site-packages/gnuradio/.debug \ - ${libdir}/python*/site-packages/gnuradio/*/.debug \ - " - -FILES_gnuradio-usrp = "${libdir}/python*/site-packages/usrp/* \ - ${bindir}/usrp* \ - ${datadir}/usrp/*/*" -FILES_gnuradio-usrp-dbg = "${libdir}/python*/site-packages/usrp/.debug" diff --git a/recipes/gnuradio/gnuradio_3.1.3.bb b/recipes/gnuradio/gnuradio_3.1.3.bb index fbce7bdf74..685b317999 100644 --- a/recipes/gnuradio/gnuradio_3.1.3.bb +++ b/recipes/gnuradio/gnuradio_3.1.3.bb @@ -1,4 +1,4 @@ -require gnuradio.inc +require gnuradio-libusb-compat.inc PR = "${INC_PR}.1" diff --git a/recipes/gnuradio/gnuradio_3.2.0.bb b/recipes/gnuradio/gnuradio_3.2.0.bb index 8c3a77e20b..cf2491b41c 100644 --- a/recipes/gnuradio/gnuradio_3.2.0.bb +++ b/recipes/gnuradio/gnuradio_3.2.0.bb @@ -1,4 +1,4 @@ -require gnuradio.inc +require gnuradio-libusb-compat.inc DEPENDS += " gsl " diff --git a/recipes/gnuradio/gnuradio_3.2.1.bb b/recipes/gnuradio/gnuradio_3.2.1.bb index 649df09e0a..f91949291d 100644 --- a/recipes/gnuradio/gnuradio_3.2.1.bb +++ b/recipes/gnuradio/gnuradio_3.2.1.bb @@ -1,4 +1,4 @@ -require gnuradio.inc +require gnuradio-libusb-compat.inc DEPENDS += " gsl " -- cgit 1.2.3-korg