Re: hal-0.5.11 fails with external toolchain/SDK

[Denys Dmytriyenko <denis@denix.org>]

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

On Tue, Nov 04, 2008 at 12:13:24PM +0100, Holger Freyther wrote:
> On Tuesday 04 November 2008 01:55:12 Denys Dmytriyenko wrote:
> > Hi,
> >
> > New hal-0.5.11 from OpenMoko breaks builds with external-toolchain/SDK, as
> > it hardcodes linux/input.h like this:
> 
> It is Openmoko, and I did add it.
> 
> what about something among the lines of?
> 
> echo "#include <linux/input.h>" | cpp | less | grep "linux\/input.h"

Thanks for the hint. I was able to fix it, so it finds the right linux/input.h 
file even with external-toolchain/SDK.

The patch is attached to the ticket #4799 and this email. I was not able to 
call autoreconf, as it was giving too many problems. autotools_do_configure 
worked fine, but unfortunately, it doesn't take parameters to pass to the 
oe_runconf, so I had to call it again with the correct --with flag. Let me 
know if it's Ok or not. Thanks.

-- 
Denys

[-- Attachment #2: hal-0.5.11-linux-input-h-sdk.patch --]
[-- Type: text/plain, Size: 761 bytes --]

diff --git a/packages/hal/hal_0.5.11.bb b/packages/hal/hal_0.5.11.bb
index e93ad64..432af22 100644
--- a/packages/hal/hal_0.5.11.bb
+++ b/packages/hal/hal_0.5.11.bb
@@ -1,8 +1,15 @@
 require hal.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " file://hal-right-input-h.patch;patch=1 \
              file://fix-configure.diff;patch=1"
 
-EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
+# The following code finds the right linux/input.h,
+# which also works with external-toolchain/SDK
+do_configure() {
+	linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \
+		grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'`
+	autotools_do_configure
+	oe_runconf --with-linux-input-header=${linux_input_h}
+}