diff options
| author |   Richard Yao <ryao@gentoo.org> | 2013-02-06 01:48:51 +0000 |
|---|---|---|
| committer | Richard Yao <ryao@gentoo.org> | 2013-02-06 01:48:51 +0000 |
| commit | f93e3b0aac1cb47101797b2988ad7722575f1842 (patch) | |
| tree | 5f3460a4073c3b179a21f976395d3164300afc61 /sys-fs/zfs/zfs-9999.ebuild | |
| parent | Add DEPEND=virtual/awk, properly cast constant for 32-bit systems (diff) | |
| download | gentoo-2-f93e3b0aac1cb47101797b2988ad7722575f1842.tar.gz gentoo-2-f93e3b0aac1cb47101797b2988ad7722575f1842.tar.bz2 gentoo-2-f93e3b0aac1cb47101797b2988ad7722575f1842.zip | |
Depend on virtual/awk instead of sys-apps/gawk (bug \#455684), fix path to parted for regression test suite, fix libpool function relocations (thanks DH for testing).
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-fs/zfs/zfs-9999.ebuild')
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 46918d1d8fb3..6711c511b9f5 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.43 2013/02/04 17:31:37 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.44 2013/02/06 01:48:50 ryao Exp $ EAPI="4" @@ -32,6 +32,7 @@ RESTRICT="test" COMMON_DEPEND=" sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] + virtual/awk " DEPEND="${COMMON_DEPEND} virtual/pkgconfig @@ -43,7 +44,6 @@ RDEPEND="${COMMON_DEPEND} !sys-fs/zfs-fuse !prefix? ( virtual/udev ) test-suite? ( - sys-apps/gawk sys-apps/util-linux sys-devel/bc sys-block/parted @@ -64,10 +64,16 @@ pkg_setup() { } src_prepare() { - # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die - # Workaround rename - sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die + # Update paths + sed -e "s|/sbin/lsmod|/bin/lsmod|" \ + -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ + -e "s|/sbin/parted|/usr/sbin/parted|" \ + -i scripts/common.sh.in + + if [ ${PV} != "9999" ] + then + epatch "${FILESDIR}/${P}-fix-libzpool-function-relocations.patch" + fi autotools-utils_src_prepare } |