[1/2] libx11: move xcms enabling to PACKAGECONFIG for LSB Library Check

Submitted by Hongxu Jia on June 26, 2013, 2:30 a.m.

Details

Message ID a1060761efe1f7eb6f02d12848c2b89c685f07e1.1372212772.git.hongxu.jia@windriver.com
State New
Headers show

Commit Message

Hongxu Jia June 26, 2013, 2:30 a.m.
When --disable-xcms is used, the LSB 4.1 Library Check will fail:
...
Checking library symbols (libX11.so.6)
Did not find XcmsAddColorSpace (unversioned) in libX11.so.6
Did not find XcmsAddFunctionSet (unversioned) in libX11.so.6
Did not find XcmsAllocColor (unversioned) in libX11.so.6
...

[YOCTO #4016]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-graphics/xorg-lib/libx11.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index e0fce3e..c9506b0 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -25,10 +25,9 @@  DEPENDS += "xproto-native"
 EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
 EXTRA_OEMAKE += 'CWARNFLAGS=""'
 
-# Let people with incredibly archaic requirements enable Xcms, but disable it by
-# default.
+# LSB 4.1 Library Check requires enable Xcms, set enable as default.
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
+PACKAGECONFIG[xcms] = "--enable-xcms"
 
 # src/util/makekeys is built natively but needs -D_GNU_SOURCE defined.
 CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"

Comments

Ross Burton June 26, 2013, 8:19 a.m.
On 26 June 2013 03:30, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> +# LSB 4.1 Library Check requires enable Xcms, set enable as default.
>  PACKAGECONFIG ??= ""
> -PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
> +PACKAGECONFIG[xcms] = "--enable-xcms"

Whether to enable Xcms by default is something we're debating right
now, and this is an interesting data point.

However, this is entirely the wrong way of doing what you want to
achieve.  I suggest you read the documentation on PACKAGECONFIG, but
the patch should have been:

- PACKAGECONFIG ??= ""
+ PACKAGECONFIG ??= "xcms"

NACKing for now as I plan to do a little more investigation on this
today - it's conceivable we'll enable xcms in LSB builds specifically.

Ross