Re: [meta-oe][PATCH] gnuradio : Update recipe to build on all machines again.

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2930 bytes --]

On Mon, May 13, 2013 at 10:59:45AM -0400, Philip Balister wrote:
> Also updated the git repo address after recent changes in hosting.
> 
> The recipe failed to build for machines without neon as a tune feature.
> The cmake config options have been changed so that it configures properly
> now.
> 
> Test on armv7a, x86, and x86-64.
> 
> Signed-off-by: Philip Balister <philip@balister.org>
> ---
>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> index edd4615..9e6998b 100644
> --- a/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> +++ b/meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb
> @@ -70,7 +70,7 @@ SRCREV = "5f69899e059e9bea58f92af61f70fc3f63825087"
>  GIT_REPO = "gnuradio.git"
>  GIT_BRANCH = "master"
>  
> -SRC_URI = "git://gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
> +SRC_URI = "git://git.gnuradio.org/${GIT_REPO};branch=${GIT_BRANCH};protocol=git \
>  "
>  
>  S="${WORKDIR}/git"
> @@ -88,15 +88,11 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
>                   -DQT_LIBRARY_DIR=${STAGING_LIBDIR} \
>                   -DQT_QTCORE_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtCore.so \
>                   -DQT_QTGUI_LIBRARY_RELEASE=${STAGING_LIBDIR}/libQtGui.so \
> +                 ${@base_contains('TUNE_FEATURES', 'neon', \
> +                     '-Dhave_mfpu_neon=1', '-Dhave_mfpu_neon=0', d)} \
>  "
>  
>  inherit distutils-base cmake pkgconfig
>  
>  EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
>  
> -# Only builds for machines with neon instructions. Problem is in upstream cmake.
> -python () {
> -    if not oe.utils.contains ('TUNE_FEATURES', 'neon', True, False, d):
> -        raise bb.parse.SkipPackage("'neon' not in TUNE_FEATURES")
> -}

Hi, 

this enables gnuradio to build on qemu* MACHINEs I'm testing and it
failed on all 3 because of docs generation, can you disable it?

| [ 20%] /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml:6: warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
| ]>
|   ^
| warning: failed to load external entity "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/docbookx.dtd"
| validity error : Could not load the external subset "docbookx.dtd"
| Document /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnuradio/3.6.4.1-r0/git/gr-trellis/doc/gr-trellis.xml does not validate

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]