diff options
| author |   Richard Yao <ryao@gentoo.org> | 2012-08-06 13:48:44 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2012-08-06 13:48:44 +0000 |
| commit | 48cc4f0dd552c8519b425615d0acbc28fd9cfebd (patch) | |
| tree | 8f6f358dc1b1c8abf2c9edb5bf03210b5cb9cc2e /sys-fs/zfs | |
| parent | Fix build with gnutls, bug #428592 (diff) | |
| download | gentoo-2-48cc4f0dd552c8519b425615d0acbc28fd9cfebd.tar.gz gentoo-2-48cc4f0dd552c8519b425615d0acbc28fd9cfebd.tar.bz2 gentoo-2-48cc4f0dd552c8519b425615d0acbc28fd9cfebd.zip | |
Use pkgconfig to detect udev directory location
(Portage version: 2.1.10.65/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/zfs')
| -rw-r--r-- | sys-fs/zfs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild | 12 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 12 |
3 files changed, 21 insertions, 9 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index 6f31d9d03bb4..0a1a97c716a4 100644 --- a/sys-fs/zfs/ChangeLog +++ b/sys-fs/zfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/zfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.40 2012/07/28 21:47:04 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.41 2012/08/06 13:48:44 ryao Exp $ + + 06 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r6.ebuild, + zfs-9999.ebuild: + Use pkgconfig to detect udev directory location 28 Jul 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r6.ebuild, zfs-9999.ebuild: diff --git a/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild b/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild index 6390da61aa3e..e3b150a226a5 100644 --- a/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild +++ b/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild,v 1.2 2012/07/28 21:47:04 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc9-r6.ebuild,v 1.3 2012/08/06 13:48:44 ryao Exp $ EAPI="4" @@ -28,12 +28,16 @@ LICENSE="BSD-2 CDDL MIT" SLOT="0" IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs" -DEPEND=" +COMMON_DEPEND=" =sys-kernel/spl-${PV}* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" + +RDEPEND="${COMMON_DEPEND} !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( @@ -105,7 +109,7 @@ src_configure() { --with-config=all --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="${EPREFIX}/lib/udev" + --with-udevdir="$(tc-getPKG_CONFIG) --variable=udevdir udev" $(use_enable debug) ) autotools-utils_src_configure diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index e8a687ce33da..ee5de04749a7 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.30 2012/07/28 21:47:04 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.31 2012/08/06 13:48:44 ryao Exp $ EAPI="4" @@ -28,12 +28,16 @@ LICENSE="BSD-2 CDDL MIT" SLOT="0" IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs" -DEPEND=" +COMMON_DEPEND=" =sys-kernel/spl-${PV}* sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" + +RDEPEND="${COMMON_DEPEND} !sys-fs/zfs-fuse !prefix? ( sys-fs/udev ) test-suite? ( @@ -105,7 +109,7 @@ src_configure() { --with-config=all --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="${EPREFIX}/lib/udev" + --with-udevdir="$(tc-getPKG_CONFIG) --variable=udevdir udev" $(use_enable debug) ) autotools-utils_src_configure |