Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/multipath-tools/
Date: Sun, 30 Oct 2022 21:32:20
Message-Id: 1667165524.4700792d0f60249c0079b19bbf324906a89f43ec.sam@gentoo
1 commit: 4700792d0f60249c0079b19bbf324906a89f43ec
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 21:31:49 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 21:32:04 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4700792d
7
8 sys-fs/multipath-tools: add note for Makefile hack
9
10 It should be fixed upstream in 0.9.3.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild | 9 +++++----
15 1 file changed, 5 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
18 index 74c4e010e73a..9edc596d1197 100644
19 --- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
20 +++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild
21 @@ -29,11 +29,9 @@ BDEPEND="virtual/pkgconfig"
22
23 CONFIG_CHECK="~DM_MULTIPATH"
24
25 -PATCHES=( )
26 -
27 src_prepare() {
28 default
29 - # life is too short for some trivial patches
30 +
31 sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \
32 "${S}"/Makefile.inc || die
33 }
34 @@ -55,7 +53,9 @@ src_compile() {
35
36 src_install() {
37 dodir /sbin
38 - # upstream makefile has terrible $(prefix) choices
39 +
40 + # Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53
41 + # $(prefix) doesn't work correctly in makefile in 0.9.3.
42 emake \
43 DESTDIR="${ED}" \
44 prefix="${EPREFIX}" \
45 @@ -67,6 +67,7 @@ src_install() {
46 GENTOO_CFLAGS="${CFLAGS}" \
47 GENTOO_CPPFLAGS="${CPPFLAGS}" \
48 install
49 +
50 rmdir "${ED}"/usr/include
51 rmdir "${ED}"/usr/share
52 mv "${ED}"/include "${ED}"/usr/include || die