summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-14 22:28:07 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-14 22:28:07 +0000
commit8bf48dff561742942b2c5f1babb0e05dadd23eda (patch)
tree33a3db71076c61fc591aed9f56730f83fca3c0f9 /meta
parenta905da367fa29bd17720ec0fada063e032deaa00 (diff)
downloadpoky-8bf48dff561742942b2c5f1babb0e05dadd23eda.tar.gz
hal: Add fix for libtool 2.2.2
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4260 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/hal/hal/configure_fix.patch60
-rw-r--r--meta/packages/hal/hal_0.5.9.1.bb9
2 files changed, 65 insertions, 4 deletions
diff --git a/meta/packages/hal/hal/configure_fix.patch b/meta/packages/hal/hal/configure_fix.patch
new file mode 100644
index 0000000000..e8417040de
--- /dev/null
+++ b/meta/packages/hal/hal/configure_fix.patch
@@ -0,0 +1,60 @@
1The AC_LANG sections upset libtool 2.2.2, as do .cpp files without a call
2to AC_PROG_CXX. Easiest solution is to patch this out for now.
3
4RP - 14/4/08
5
6Index: hal-0.5.9.1/configure.in
7===================================================================
8--- hal-0.5.9.1.orig/configure.in 2008-04-14 22:41:49.000000000 +0100
9+++ hal-0.5.9.1/configure.in 2008-04-14 22:43:13.000000000 +0100
10@@ -345,32 +345,8 @@
11 fi
12
13 dnl Check for libsmbios
14-AC_LANG_PUSH([C++])
15-AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no )
16-AC_LANG_POP([C++])
17-if test "$LIB_SMBIOS" = "yes" ; then
18- AC_MSG_CHECKING([for libsmbios >= 0.13.4])
19- AC_TRY_RUN(
20- #include <smbios/version.h>
21- int main ()
22- {
23- int major ;
24- int minor ;
25- int micro ;
26-
27- if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, &micro ) == 3 ) {
28- if ((major == 0 && minor == 13 && micro >= 4) ||
29- (major >= 0 && minor > 13)) {
30- return 0;
31- }
32- }
33- return 1;
34- } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)],
35- [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)])
36-else
37- USE_SMBIOS=no
38- AM_CONDITIONAL(HAVE_SMBIOS,false)
39-fi
40+USE_SMBIOS=no
41+AM_CONDITIONAL(HAVE_SMBIOS,false)
42
43 AC_ARG_WITH([libpci],
44 [AS_HELP_STRING([--without-libpci],
45Index: hal-0.5.9.1/hald/linux/addons/Makefile.am
46===================================================================
47--- hal-0.5.9.1.orig/hald/linux/addons/Makefile.am 2008-04-14 22:45:18.000000000 +0100
48+++ hal-0.5.9.1/hald/linux/addons/Makefile.am 2008-04-14 22:46:05.000000000 +0100
49@@ -60,11 +60,6 @@
50 hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @GLIB_LIBS@
51 endif
52
53-if BUILD_DELL
54-libexec_PROGRAMS += hald-addon-dell-backlight
55-hald_addon_dell_backlight_SOURCES = addon-dell-backlight.cpp ../../logger.c
56-hald_addon_dell_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lsmbios @GLIB_LIBS@
57-endif
58 endif
59
60 hald_addon_acpi_SOURCES = addon-acpi.c ../../logger.c ../../util_helper.c
diff --git a/meta/packages/hal/hal_0.5.9.1.bb b/meta/packages/hal/hal_0.5.9.1.bb
index 8422647ac4..8e4ad23937 100644
--- a/meta/packages/hal/hal_0.5.9.1.bb
+++ b/meta/packages/hal/hal_0.5.9.1.bb
@@ -7,12 +7,13 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
7RDEPENDS_${PN} += "udev hal-info" 7RDEPENDS_${PN} += "udev hal-info"
8RRECOMMENDS_${PN} += "udev-utils" 8RRECOMMENDS_${PN} += "udev-utils"
9 9
10PR = "r5" 10PR = "r6"
11 11
12SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ 12SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
13 file://sg-inhibit.patch;patch=1 \ 13 file://configure_fix.patch;patch=1 \
14 file://20hal \ 14 file://sg-inhibit.patch;patch=1 \
15 file://99_hal" 15 file://20hal \
16 file://99_hal"
16 17
17S = "${WORKDIR}/hal-${PV}" 18S = "${WORKDIR}/hal-${PV}"
18 19