From: Koen Kooi <koen@openembedded.org>
Date: Wed, 29 Oct 2008 15:44:55 +0000 (+0100)
Subject: hal 0.5.11: add fix from hal git to fix libtool issues in configure
X-Git-Tag: Release-2010-05/1~5563
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc39745f3c8ea019033b811f6ef0ececb110d330;p=openembedded.git

hal 0.5.11: add fix from hal git to fix libtool issues in configure
---

diff --git a/packages/hal/hal-0.5.11/fix-configure.diff b/packages/hal/hal-0.5.11/fix-configure.diff
new file mode 100644
index 0000000000..7d9d42d69f
--- /dev/null
+++ b/packages/hal/hal-0.5.11/fix-configure.diff
@@ -0,0 +1,22 @@
+From: Rémi Cardona <remi@gentoo.org>
+Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200)
+Subject: add libtool-2.2 support
+X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d
+
+add libtool-2.2 support
+
+Fix for aclocal to work properly with libtool 2.2 which no longer
+checks for C++ automatically (this patch is of course backwards
+compatible with libtool 1.5.x)
+---
+
+--- a/configure.in
++++ b/configure.in
+@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE)
+ 
+ AC_ISC_POSIX
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_CC_C_O
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
diff --git a/packages/hal/hal_0.5.11.bb b/packages/hal/hal_0.5.11.bb
index 5408756510..e93ad64ac3 100644
--- a/packages/hal/hal_0.5.11.bb
+++ b/packages/hal/hal_0.5.11.bb
@@ -1,4 +1,8 @@
 require hal.inc
 
-SRC_URI += " file://hal-right-input-h.patch;patch=1"
+PR = "r1"
+
+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"