Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/
Date: Wed, 06 Apr 2022 21:05:19
Message-Id: 1649279098.6904371a540ac1e75b52b80dd83e4b486bcf609c.soap@gentoo
1 commit: 6904371a540ac1e75b52b80dd83e4b486bcf609c
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 6 21:04:58 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 6 21:04:58 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6904371a
7
8 sys-fs/e2fsprogs: fix parallel make bug
9
10 Bug: https://bugs.gentoo.org/806875
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild | 1 +
14 .../files/e2fsprogs-1.46.5-parallel-make.patch | 29 ++++++++++++++++++++++
15 2 files changed, 30 insertions(+)
16
17 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
18 index 3e84085d14a9..cf2b79c99bc2 100644
19 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
20 +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
21 @@ -30,6 +30,7 @@ PATCHES=(
22 "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
23
24 # Upstream patches (can usually removed with next version bump)
25 + "${FILESDIR}"/${P}-parallel-make.patch
26 )
27
28 pkg_setup() {
29
30 diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
31 new file mode 100644
32 index 000000000000..335f6659457d
33 --- /dev/null
34 +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
35 @@ -0,0 +1,29 @@
36 +--- a/lib/ext2fs/Makefile.in
37 ++++ b/lib/ext2fs/Makefile.in
38 +@@ -729,6 +729,12 @@
39 + $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
40 + $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h \
41 + $(srcdir)/compiler.h
42 ++blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
43 ++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
44 ++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
45 ++ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
46 ++ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
47 ++ $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h
48 + block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
49 + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
50 + $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
51 +@@ -837,6 +843,13 @@
52 + $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
53 + $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
54 + $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
55 ++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
56 ++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
57 ++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
58 ++fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
59 ++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
60 ++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
61 ++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
62 + $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
63 + $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
64 + $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h