diff options
author | obache <obache@pkgsrc.org> | 2009-01-03 01:28:34 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2009-01-03 01:28:34 +0000 |
commit | 438b358b86002e8eebe6a6326ac6a747b89f7fbe (patch) | |
tree | 2f15649fc28a7c6cf4b75656b627cd250f94f3d5 | |
parent | efebc46dbf84ff70db88c9e2bdbe8ad6c41523d2 (diff) | |
download | pkgsrc-438b358b86002e8eebe6a6326ac6a747b89f7fbe.tar.gz |
Restrict necessity of libvolume_id to using linux/freebsd/netbsd hald backends.
Fixes build failure on platforms using dummy backend, as PR 40291.
-rw-r--r-- | sysutils/hal/distinfo | 4 | ||||
-rw-r--r-- | sysutils/hal/patches/patch-na | 40 |
2 files changed, 27 insertions, 17 deletions
diff --git a/sysutils/hal/distinfo b/sysutils/hal/distinfo index d56d892846a..16e9c5ceafe 100644 --- a/sysutils/hal/distinfo +++ b/sysutils/hal/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2008/12/22 11:06:15 jmcneill Exp $ +$NetBSD: distinfo,v 1.11 2009/01/03 01:28:34 obache Exp $ SHA1 (hal-0.5.11.tar.bz2) = 1ddb7895d2ddc2464b553ad11f7ba38860478ae9 RMD160 (hal-0.5.11.tar.bz2) = 741cfe82f0bc2d67106b24cfe526a754ab36e45f @@ -19,6 +19,6 @@ SHA1 (patch-am) = 6a4940006e583300d9a983511bdcb05268f74b1a SHA1 (patch-an) = 0307b2f0f6bb5e4a6d7bf837163e74749b7d24b2 SHA1 (patch-ao) = 9099fa4783921a0389b874b8f6d3f7b890810b34 SHA1 (patch-ap) = 4846d30f51239cca5ea895c700d7a7b15efd948e -SHA1 (patch-na) = 77b7c505bf3644fe19f26463eb1272b7cb3ceaf6 +SHA1 (patch-na) = f4344e2aa02e67c968f9723495c533c3a9a199fd SHA1 (patch-nb) = 1693b7a2faa5bee20a594f0b60b8ff6caea0efdc SHA1 (patch-nc) = 32453e49734902749ce24eb4364fc7f531986227 diff --git a/sysutils/hal/patches/patch-na b/sysutils/hal/patches/patch-na index 7311a994dda..52fb1f94a10 100644 --- a/sysutils/hal/patches/patch-na +++ b/sysutils/hal/patches/patch-na @@ -1,8 +1,8 @@ -$NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ +$NetBSD: patch-na,v 1.4 2009/01/03 01:28:34 obache Exp $ ---- configure.in.orig 2008-05-07 19:24:31.000000000 -0400 -+++ configure.in 2008-12-20 15:28:11.000000000 -0500 -@@ -448,7 +448,7 @@ +--- configure.in.orig 2008-05-07 23:24:31.000000000 +0000 ++++ configure.in +@@ -448,7 +448,7 @@ AM_CONDITIONAL([HAVE_LIBPCI], [test "x$U AC_ARG_WITH([backend], AS_HELP_STRING([--with-backend=<name>], @@ -11,7 +11,7 @@ $NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ [backend=$withval]) if ! test -z "$with_backend" ; then HALD_BACKEND="$with_backend" -@@ -457,6 +457,9 @@ +@@ -457,6 +457,9 @@ else *-*-solaris*) HALD_BACKEND="solaris" ;; @@ -21,7 +21,7 @@ $NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ *-*-freebsd*) HALD_BACKEND="freebsd" ;; -@@ -472,6 +475,7 @@ +@@ -472,6 +475,7 @@ AM_CONDITIONAL(HALD_COMPILE_DUMMY, [test AM_CONDITIONAL(HALD_COMPILE_LINUX, [test x$HALD_BACKEND = xlinux], [Compiling for Linux]) AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compiling for FreeBSD]) AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) @@ -29,16 +29,26 @@ $NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ AC_SUBST(HALD_BACKEND) dnl DBUS API is subject to changes -@@ -644,6 +648,8 @@ - case "$host" in - *-*-solaris*) - ;; -+*-*-darwin*) -+ ;; - *) +@@ -641,13 +645,14 @@ fi + AC_MSG_RESULT($have_glib_2_14) + + # volume_id +-case "$host" in +-*-*-solaris*) +- ;; +-*) ++case "$HALD_BACKEND" in ++linux|freebsd|netbsd) PKG_CHECK_MODULES(VOLUME_ID, [$volume_id_module]) AC_SUBST(VOLUME_ID_CFLAGS) -@@ -1004,6 +1010,9 @@ + AC_SUBST(VOLUME_ID_LIBS) ++ ;; ++*) ++ ;; + esac + + # OS specific libs +@@ -1004,6 +1009,9 @@ hald/linux/addons/Makefile hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile @@ -48,7 +58,7 @@ $NetBSD: patch-na,v 1.3 2008/12/20 21:11:05 jmcneill Exp $ hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile -@@ -1014,6 +1023,7 @@ +@@ -1014,6 +1022,7 @@ libhal-storage/Makefile tools/Makefile tools/freebsd/Makefile tools/linux/Makefile |