commit:     6904371a540ac1e75b52b80dd83e4b486bcf609c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 21:04:58 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 21:04:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6904371a

sys-fs/e2fsprogs: fix parallel make bug

Bug: https://bugs.gentoo.org/806875
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild           |  1 +
 .../files/e2fsprogs-1.46.5-parallel-make.patch     | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild 
b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
index 3e84085d14a9..cf2b79c99bc2 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
        # Upstream patches (can usually removed with next version bump)
+       "${FILESDIR}"/${P}-parallel-make.patch
 )
 
 pkg_setup() {

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
new file mode 100644
index 000000000000..335f6659457d
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.46.5-parallel-make.patch
@@ -0,0 +1,29 @@
+--- a/lib/ext2fs/Makefile.in
++++ b/lib/ext2fs/Makefile.in
+@@ -729,6 +729,12 @@
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h 
\
+  $(srcdir)/compiler.h
++blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
++ $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \
++ $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
++ $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h
+ block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
+@@ -837,6 +843,13 @@
+  $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
+  $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
+  $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
++ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
++ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
++ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
++fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
++ $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
++ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fsP.h \
++ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
+  $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
+  $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
+  $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h

Reply via email to