[oe] [meta-oe][PATCHv3] gnuradio : Update recipe to build for all machines.

[Martin Jansa]

On Wed, May 22, 2013 at 06:35:37AM -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.
> 
> Also dropped documentation from build to work around a doc generation problem.
> 
> Test on armv7a, x86, and x86-64.
> 
> Signed-off-by: Philip Balister <philip at balister.org>
> ---
>  meta-oe/recipes-connectivity/gnuradio/gnuradio_git.bb | 11 ++++-------
>  1 file changed, 4 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..45f4c77 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"
> @@ -82,21 +82,18 @@ EXTRA_OECMAKE = "-DENABLE_GR_ATSC=FALSE \
>                   -DENABLE_GR_FCD=OFF \
>                   -DENABLE_GR_WXGUI=OFF \
>                   -DENABLE_GR_VIDEO_SDL=OFF \
> +                 -DENABLE_SPHINX=OFF -DENABLE_DOXYGEN=OFF \

This isn't enough, it still fails to build docs in jenkins builds (see
status update email).

>                   -DIMPORT_EXECUTABLES=${S}/gr-vocoder/lib/generate_codebook.txt \
>                   -DQT_HEADERS_DIR=${STAGING_INCDIR}/qt4 \
>                   -DQT_QTCORE_INCLUDE_DIR=${STAGING_INCDIR}/qt4/QtCore \
>                   -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")
> -}
> -
> -- 
> 1.7.11.7
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20130603/2462a74f/attachment-0002.sig>