diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2014-05-29 02:38:52 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2014-05-29 02:38:52 +0000 |
| commit | 7cfce38d4af2c7c520d9ba4de0246fc20e6def16 (patch) | |
| tree | 40d566c42659e1354176072b8f00c70d4b0af8d3 /sys-fs | |
| parent | Temporarily drop keywords on new version until all dependencies are available (diff) | |
| download | gentoo-2-7cfce38d4af2c7c520d9ba4de0246fc20e6def16.tar.gz gentoo-2-7cfce38d4af2c7c520d9ba4de0246fc20e6def16.tar.bz2 gentoo-2-7cfce38d4af2c7c520d9ba4de0246fc20e6def16.zip | |
Fix parallel build failure #511708
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/e2fsprogs/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild | 3 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch | 28 |
3 files changed, 36 insertions, 2 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog index d6c58793b6cd..70a0db818566 100644 --- a/sys-fs/e2fsprogs/ChangeLog +++ b/sys-fs/e2fsprogs/ChangeLog @@ -1,6 +1,11 @@ # 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.275 2014/05/28 10:40:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.276 2014/05/29 02:38:52 patrick Exp $ + + 29 May 2014; Patrick Lauer <patrick@gentoo.org> + +files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch, + e2fsprogs-1.42.10.ebuild: + Fix parallel build failure #511708 *e2fsprogs-1.42.10 (28 May 2014) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild index e1b7175379e0..098f50b6e075 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.1 2014/05/28 10:40:20 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.2 2014/05/29 02:38:52 patrick Exp $ EAPI=4 @@ -42,6 +42,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch + epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch if [[ ${CHOST} == *-mint* ]] ; then epatch "${FILESDIR}"/${PN}-1.41-mint.patch epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch new file mode 100644 index 000000000000..033084706f42 --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch @@ -0,0 +1,28 @@ +From 5c15bf5f978bae01f1ca3cbe6414ab1d355a6adf Mon Sep 17 00:00:00 2001 +From: Theodore Ts'o <tytso@mit.edu> +Date: Thu, 22 May 2014 18:52:27 -0400 +Subject: e2fsck: fix Makefile dependency for quota.o + +Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> + +diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in +index 4b10f6f..f773fea 100644 +--- a/e2fsck/Makefile.in ++++ b/e2fsck/Makefile.in +@@ -552,3 +552,13 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \ + $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \ + $(top_srcdir)/lib/../e2fsck/dict.h + prof_err.o: prof_err.c ++quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \ ++ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ ++ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ ++ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ ++ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ ++ $(top_builddir)/lib/ext2fs/ext2_err.h \ ++ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ ++ $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/quota/quotaio.h \ ++ $(top_srcdir)/lib/quota/dqblk_v2.h $(top_srcdir)/lib/quota/quotaio_tree.h \ ++ $(top_srcdir)/lib/../e2fsck/dict.h $(srcdir)/problem.h +-- +cgit v0.10.1 + |