summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-08-05 09:32:43 +0000
committerMike Frysinger <vapier@gentoo.org>2014-08-05 09:32:43 +0000
commit0bcfd1bf9dda156d6de76806f0a786c8c83374c7 (patch)
treeac7564906506b79191a05f28d60d157e614659f6 /sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
parentVersion bump (diff)
downloadgentoo-2-0bcfd1bf9dda156d6de76806f0a786c8c83374c7.tar.gz
gentoo-2-0bcfd1bf9dda156d6de76806f0a786c8c83374c7.tar.bz2
gentoo-2-0bcfd1bf9dda156d6de76806f0a786c8c83374c7.zip
Get tests building again.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild')
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
index 85b53b76b1de..ed12406e5d34 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.14 2014/08/05 09:19:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.15 2014/08/05 09:32:43 vapier Exp $
EAPI=4
@@ -35,6 +35,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
epatch "${FILESDIR}"/${P}-fix-build-cflags.patch
+
# blargh ... trick e2fsprogs into using e2fsprogs-libs
rm -rf doc
sed -i -r \
@@ -45,9 +46,10 @@ src_prepare() {
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
Makefile.in || die "remove subdirs"
+ ln -s $(which mk_cmds) lib/ss/ || die
# Avoid rebuild
- touch lib/ss/ss_err.h
+ echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
eautoreconf
}