diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-08-05 09:32:43 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-08-05 09:32:43 +0000 |
| commit | 0bcfd1bf9dda156d6de76806f0a786c8c83374c7 (patch) | |
| tree | ac7564906506b79191a05f28d60d157e614659f6 /sys-fs | |
| parent | Version bump (diff) | |
| download | gentoo-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')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild | 6 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild | 6 |
3 files changed, 13 insertions, 5 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index 7e2cb2d8a1e7..3bd20d1b8a14 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/e2fsprogs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.291 2014/08/05 09:19:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.292 2014/08/05 09:32:43 vapier Exp $ + + 05 Aug 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.10.ebuild, + e2fsprogs-1.42.11.ebuild: + Get tests building again. 05 Aug 2014; Mike Frysinger <vapier@gentoo.org> +files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.10.ebuild, 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 } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild index 3e077f8e19ee..07f36a46ef02 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.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.11.ebuild,v 1.4 2014/08/05 09:01:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.5 2014/08/05 09:32:43 vapier Exp $ EAPI=4 @@ -39,6 +39,7 @@ src_prepare() { fi epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch + # blargh ... trick e2fsprogs into using e2fsprogs-libs rm -rf doc sed -i -r \ @@ -49,9 +50,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 } |