diff options
| author | root <root@evil.(none)> | 2009-05-30 02:54:08 +0300 |
|---|---|---|
| committer | root <root@evil.(none)> | 2009-05-30 02:54:08 +0300 |
| commit | 05859683b68c69f33109ed44245b485aa4a4bcb7 (patch) | |
| tree | 265043bbdcbcf272080cbf211bb8acc8245952bb /sys-fs/e2fsprogs | |
| parent | d90d42ef98f61da7a981ce97bcd4fa2decb5ea00 (diff) | |
modified: sys-apps/util-linux/util-linux-9999.ebuild
modified: sys-fs/e2fsprogs/e2fsprogs-9999.ebuild
Diffstat (limited to 'sys-fs/e2fsprogs')
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-9999.ebuild | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild index 9242291..af26cc4 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-9999.ebuild @@ -13,14 +13,16 @@ EGIT_REPO_URI="git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git" LICENSE="GPL-2 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="nls elibc_FreeBSD" +KEYWORDS="" +IUSE="nls elibc_FreeBSD +without-blkid" -RDEPEND="sys-libs/${PN}-libs +RDEPEND="without-blkid? ( !sys-libs/${PN}-libs ) nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext ) - sys-apps/texinfo" + sys-apps/texinfo + without-blkid? ( sys-apps/util-linux[builtin-blkid] ) + " pkg_setup() { if [[ ! -e ${ROOT}/etc/mtab ]] ; then @@ -65,11 +67,13 @@ src_compile() { esac econf \ + --libdir=/lib \ --bindir=/bin \ --sbindir=/sbin \ --enable-${libtype}-shlibs \ --with-ldopts="${LDFLAGS}" \ $(use_enable !elibc_uclibc tls) \ + $(useq without-blkid && echo --disable-libblkid) \ --without-included-gettext \ $(use_enable nls) \ $(use_enable userland_GNU fsck) \ @@ -80,7 +84,7 @@ src_compile() { eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096" die "Preventing included intl cruft from building" fi - emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die + emake || die # Build the FreeBSD helper if use elibc_FreeBSD ; then |