Patchwork [2/2] weston: fix make-lcms-configurable.patch

login
register
mail settings
Submitter Tim Orling
Date May 29, 2014, 2:30 p.m.
Message ID <1401373808-24609-2-git-send-email-ticotimo@gmail.com>
Download mbox | patch
Permalink /patch/72963/
State Accepted
Commit dd1dacf7bde252294d63215df6a5d7636110f003
Headers show

Comments

Tim Orling - May 29, 2014, 2:30 p.m.
From: Tim Orling <TicoTimo@gmail.com>

In AS_IF([test "x$enable_lcms" != "no"],
"no" should have been "xno"

Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
 meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Ross Burton - May 29, 2014, 10:49 p.m.
On 29 May 2014 15:30, Tim Orling <ticotimo@gmail.com> wrote:
> In AS_IF([test "x$enable_lcms" != "no"],
> "no" should have been "xno"

This patch doesn't quite satisfy the general goal we have of being
fully deterministic: if --enable-lcms is specified but the lcms
dependency isn't satisfied (i.e. it gained a version requirement and
we didn't have it) then configure would happily and silently disable
lcms.

A small tweak so that it's a fatal error if lcms is specified but the
deps are not present would be good.  Also have you approached upstream
about this patch?

Ross

Patch

diff --git a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
index 817ac70..ef145b8 100644
--- a/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
+++ b/meta/recipes-graphics/wayland/weston/make-lcms-configurable.patch
@@ -11,7 +11,7 @@  Index: weston-1.5.0/configure.ac
 +                             [disable lcms support]),,
 +              enable_lcms=yes)
 +
-+AS_IF([test "x$enable_lcms" != "no"], [
++AS_IF([test "x$enable_lcms" != "xno"], [
  PKG_CHECK_MODULES(LCMS, lcms2,
 -                  [have_lcms=yes], [have_lcms=no])
 +                  [have_lcms=yes], [have_lcms=no])],