diff options
| author |   Richard Purdie <richard@openedhand.com> | 2008-04-14 22:28:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-04-14 22:28:07 +0000 |
| commit | 8bf48dff561742942b2c5f1babb0e05dadd23eda (patch) | |
| tree | 33a3db71076c61fc591aed9f56730f83fca3c0f9 /meta/packages/hal | |
| parent | a905da367fa29bd17720ec0fada063e032deaa00 (diff) | |
| download | openembedded-core-contrib-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/packages/hal')
| -rw-r--r-- | meta/packages/hal/hal/configure_fix.patch | 60 | ||||
| -rw-r--r-- | meta/packages/hal/hal_0.5.9.1.bb | 9 |
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 @@ +The AC_LANG sections upset libtool 2.2.2, as do .cpp files without a call +to AC_PROG_CXX. Easiest solution is to patch this out for now. + +RP - 14/4/08 + +Index: hal-0.5.9.1/configure.in +=================================================================== +--- hal-0.5.9.1.orig/configure.in 2008-04-14 22:41:49.000000000 +0100 ++++ hal-0.5.9.1/configure.in 2008-04-14 22:43:13.000000000 +0100 +@@ -345,32 +345,8 @@ + fi + + dnl Check for libsmbios +-AC_LANG_PUSH([C++]) +-AC_CHECK_LIB(smbios, SMBIOSFreeMemory, LIB_SMBIOS=yes , LIB_SMBIOS=no ) +-AC_LANG_POP([C++]) +-if test "$LIB_SMBIOS" = "yes" ; then +- AC_MSG_CHECKING([for libsmbios >= 0.13.4]) +- AC_TRY_RUN( +- #include <smbios/version.h> +- int main () +- { +- int major ; +- int minor ; +- int micro ; +- +- if ( sscanf( LIBSMBIOS_RELEASE_VERSION , "%d.%d.%d", &major, &minor, µ ) == 3 ) { +- if ((major == 0 && minor == 13 && micro >= 4) || +- (major >= 0 && minor > 13)) { +- return 0; +- } +- } +- return 1; +- } , [USE_SMBIOS=yes; AC_MSG_RESULT(yes); AM_CONDITIONAL(HAVE_SMBIOS,true)], +- [USE_SMBIOS=no; AC_MSG_RESULT(failed); AM_CONDITIONAL(HAVE_SMBIOS,false)]) +-else +- USE_SMBIOS=no +- AM_CONDITIONAL(HAVE_SMBIOS,false) +-fi ++USE_SMBIOS=no ++AM_CONDITIONAL(HAVE_SMBIOS,false) + + AC_ARG_WITH([libpci], + [AS_HELP_STRING([--without-libpci], +Index: hal-0.5.9.1/hald/linux/addons/Makefile.am +=================================================================== +--- hal-0.5.9.1.orig/hald/linux/addons/Makefile.am 2008-04-14 22:45:18.000000000 +0100 ++++ hal-0.5.9.1/hald/linux/addons/Makefile.am 2008-04-14 22:46:05.000000000 +0100 +@@ -60,11 +60,6 @@ + hald_addon_usb_csr_LDADD = $(top_builddir)/libhal/libhal.la -lusb @GLIB_LIBS@ + endif + +-if BUILD_DELL +-libexec_PROGRAMS += hald-addon-dell-backlight +-hald_addon_dell_backlight_SOURCES = addon-dell-backlight.cpp ../../logger.c +-hald_addon_dell_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lsmbios @GLIB_LIBS@ +-endif + endif + + 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" RDEPENDS_${PN} += "udev hal-info" RRECOMMENDS_${PN} += "udev-utils" -PR = "r5" +PR = "r6" SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \ - file://sg-inhibit.patch;patch=1 \ - file://20hal \ - file://99_hal" + file://configure_fix.patch;patch=1 \ + file://sg-inhibit.patch;patch=1 \ + file://20hal \ + file://99_hal" S = "${WORKDIR}/hal-${PV}" |