Re: [PATCH v2] mesa-demos: Fix building demos which require GLU.

From: Martin Jansa <martin.jansa@gmail.com>
To: Drew Moseley <drew_moseley@mentor.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH v2] mesa-demos: Fix building demos which require GLU.
Date: Thu, 16 Jul 2015 17:45:29 +0200	[thread overview]
Message-ID: <20150716154529.GE2134@jama> (raw)
In-Reply-To: <1437059524-15971-1-git-send-email-drew_moseley@mentor.com>

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

On Thu, Jul 16, 2015 at 11:12:04AM -0400, Drew Moseley wrote:
> The existing test for GLU support is backwards.  Reverse the
> sense of the conditional when built with "--enable-glu".
> 
> Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
> ---
>  ...figure-Allow-to-disable-demos-which-require-GLEW-.patch | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
> index 4b07193..b25f5ce 100644
> --- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
> +++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
> @@ -10,20 +10,21 @@ Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or
>  Upstream-Status: Pending
>  
>  Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> +Signed-off-by: Drew Moseley <drew_moseley@mentor.com>
>  ---
> - configure.ac                  | 49 ++++++++++++++++++++---------
> - src/Makefile.am               | 14 ++++++---
> + configure.ac                  | 50 ++++++++++++++++++++---------
> + src/Makefile.am               | 18 ++++++++---
>   src/demos/Makefile.am         | 73 ++++++++++++++++++++++++-------------------
>   src/egl/Makefile.am           |  8 +++--
>   src/egl/opengles1/Makefile.am | 44 +++++++++++++++-----------
>   src/egl/opengles2/Makefile.am | 33 ++++++++++---------
> - 6 files changed, 135 insertions(+), 86 deletions(-)
> + 6 files changed, 140 insertions(+), 86 deletions(-)
>  
>  diff --git a/configure.ac b/configure.ac
>  index 9445424..bc4c8d1 100644
>  --- a/configure.ac
>  +++ b/configure.ac
> -@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile],
> +@@ -89,25 +89,45 @@ AC_EGREP_HEADER([glutInitContextProfile],
>   		[AC_DEFINE(HAVE_FREEGLUT)],
>   		[])
>   
> @@ -66,7 +67,7 @@ index 9445424..bc4c8d1 100644
>  -DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
>  -DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
>  +if test "x$enable_glu" = xyes; then
> -+    PKG_CHECK_MODULES(GLU, [glu], [],
> ++    PKG_CHECK_MODULES(GLU, [glu],

Are you sure? It was like this in original PKG_CHECK_MODULES and I think
it was correct. 4th parameter is used as fallback to find it manually
when pkg-config doesn't find it, with your change it would use
AC_CHECK_HEADER and ignore the values set returned by pkg-config.

>  +                     [AC_CHECK_HEADER([GL/glu.h],
>  +                                      [],
>  +                                      AC_MSG_ERROR([GLU not found]))
> @@ -74,7 +75,8 @@ index 9445424..bc4c8d1 100644
>  +                                   [gluBeginCurve],
>  +                                   [GLU_LIBS=-lGLU
>  +				    glu_enabled=yes],
> -+                                   AC_MSG_ERROR([GLU required])) ])
> ++                                   AC_MSG_ERROR([GLU required])) ],
> ++                      [])
>  +
>  +    DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
>  +    DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

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