From f4bd3c4532c849d85cea1f0649d37334fe1384ac Mon Sep 17 00:00:00 2001 From: Graham Gower Date: Mon, 18 Oct 2010 20:13:27 +0000 Subject: [PATCH] xoscope_1.12.bb: Fix build failure when comedilib has already been staged. If comedilib is already staged, xoscope tries to use it and fails to build. mipsel-oe-linux-gcc -march=mips32 -DHAVE_CONFIG_H -I. -I.. -I/mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/include/gtk-1.2 -I/mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/include/glib-1.2 -I/mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/lib/glib/include -isystem/mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/include -isystem/mnt/oe/tmp/sysroots/mipsel-oe-linux/usr/include -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -Wall -MT callbacks.o -MD -MP -MF .deps/callbacks.Tpo -c -o callbacks.o callbacks.c callbacks.c:29:19: error: static declaration of 'window' follows non-static declaration callbacks.h:3:19: note: previous declaration of 'window' was here make[2]: *** [callbacks.o] Error 1 make[2]: Leaving directory `/mnt/oe/tmp/work/mipsel-oe-linux/xoscope-1.12-r1/xoscope-1.12/comedi-glade-src' So disable comedilib support at configure time. I assume since comedi is new to the tree this year and xoscope was added years ago, that comedi support is not desired. Signed-off-by: Graham Gower Signed-off-by: Khem Raj --- recipes/xoscope/xoscope_1.12.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/xoscope/xoscope_1.12.bb b/recipes/xoscope/xoscope_1.12.bb index 5ca739b56e..c8cc387a76 100644 --- a/recipes/xoscope/xoscope_1.12.bb +++ b/recipes/xoscope/xoscope_1.12.bb @@ -5,12 +5,15 @@ DEPENDS = "gtk+-1.2 esound" SRC_URI = "http://prdownloads.sourceforge.net/xoscope/xoscope-${PV}.tgz" +PR = "r1" + inherit autotools PARALLEL_MAKE = "" FILES_${PN}-dbg += "${libexecdir}/xoscope/.debug" +EXTRA_OECONF = "ac_cv_lib_comedi_comedi_open=no" SRC_URI[md5sum] = "89f8019a772713a976b634305d29cfe5" SRC_URI[sha256sum] = "d7dec98f0d85f7ce889d0b2fcb4ed683a6384057ccea2ab531a0710969ff7ca2" -- 2.39.5