commit: 4700792d0f60249c0079b19bbf324906a89f43ec Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 30 21:31:49 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 30 21:32:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4700792d
sys-fs/multipath-tools: add note for Makefile hack It should be fixed upstream in 0.9.3. Signed-off-by: Sam James <sam <AT> gentoo.org> sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild index 74c4e010e73a..9edc596d1197 100644 --- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild +++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild @@ -29,11 +29,9 @@ BDEPEND="virtual/pkgconfig" CONFIG_CHECK="~DM_MULTIPATH" -PATCHES=( ) - src_prepare() { default - # life is too short for some trivial patches + sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ "${S}"/Makefile.inc || die } @@ -55,7 +53,9 @@ src_compile() { src_install() { dodir /sbin - # upstream makefile has terrible $(prefix) choices + + # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53 + # $(prefix) doesn't work correctly in makefile in 0.9.3. emake \ DESTDIR="${ED}" \ prefix="${EPREFIX}" \ @@ -67,6 +67,7 @@ src_install() { GENTOO_CFLAGS="${CFLAGS}" \ GENTOO_CPPFLAGS="${CPPFLAGS}" \ install + rmdir "${ED}"/usr/include rmdir "${ED}"/usr/share mv "${ED}"/include "${ED}"/usr/include || die