commit: 0e2716a8a51d96c6c05c1c5b721c11d8933dff34 Author: Gwendal Grignou <gwendal <AT> chromium <DOT> org> AuthorDate: Fri Mar 27 04:01:56 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Mar 27 08:33:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e2716a8
sysdevel/e2fsprogs: install library through install Given e2fsprogs forks a make instance to install libraries, do not specify the rule install-libs when installing e2fsprogs. make install will do it once other dependencies are in place. Closes: https://bugs.gentoo.org/679640 Signed-off-by: Gwendal Grignou <gwendal <AT> chromium.org> Closes: https://github.com/gentoo/gentoo/pull/15132 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild | 3 +-- sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild | 3 +-- sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild | 3 +-- sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch | 10 ---------- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild index db28efccf15..48a3c1aae89 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild index 2be6b804acd..3cbd7bb014a 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild index 31effc07757..5db4525cd57 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild @@ -29,7 +29,6 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-1.44.6-parallel_install.patch "${FILESDIR}"/${PN}-1.40-fbsd.patch "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854 @@ -114,7 +113,7 @@ src_install() { STRIP=: \ root_libdir="${EPREFIX}/usr/$(get_libdir)" \ DESTDIR="${D}" \ - install install-libs + install einstalldocs diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch deleted file mode 100644 index 57629153192..00000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- e2fsprogs-1.44.6/Makefile.in -+++ e2fsprogs-1.44.6/Makefile.in -@@ -72,6 +72,7 @@ - uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs - - install-libs: install-libs-recursive -+install-libs-recursive:: | install-shlibs-libs-recursive - - uninstall-libs: uninstall-libs-recursive -
