| 1 |
commit: 9199809d660b52e6f4e960fc1bea889bea15cdaa |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 04:35:20 2022 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 04:35:36 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9199809d |
| 7 |
|
| 8 |
sys-fs/multipath-tools: bump |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
Reference: https://bugs.gentoo.org/show_bug.cgi?id=878763 |
| 12 |
|
| 13 |
.../multipath-tools/multipath-tools-0.9.3.ebuild | 27 +++++++++++++++------- |
| 14 |
1 file changed, 19 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild |
| 17 |
index 937105680154..74c4e010e73a 100644 |
| 18 |
--- a/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild |
| 19 |
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3.ebuild |
| 20 |
@@ -3,7 +3,7 @@ |
| 21 |
|
| 22 |
EAPI=8 |
| 23 |
|
| 24 |
-inherit linux-info systemd toolchain-funcs udev |
| 25 |
+inherit linux-info systemd toolchain-funcs udev tmpfiles |
| 26 |
|
| 27 |
DESCRIPTION="Device mapper target autoconfig" |
| 28 |
HOMEPAGE="http://christophe.varoqui.free.fr/" |
| 29 |
@@ -34,7 +34,7 @@ PATCHES=( ) |
| 30 |
src_prepare() { |
| 31 |
default |
| 32 |
# life is too short for some trivial patches |
| 33 |
- sed -r -i -e '/^(CPPFLAGS|CFLAGS)/s,:=,+=,' \ |
| 34 |
+ sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \ |
| 35 |
"${S}"/Makefile.inc || die |
| 36 |
} |
| 37 |
|
| 38 |
@@ -44,23 +44,33 @@ src_compile() { |
| 39 |
# LIBDM_API_FLUSH involves grepping files in /usr/include, |
| 40 |
# so force the test to go the way we want #411337. |
| 41 |
emake \ |
| 42 |
- prefix="${EPREFIX}" \ |
| 43 |
+ prefix="${EPREFIX}/usr" \ |
| 44 |
LIB="$(get_libdir)" \ |
| 45 |
LIBDM_API_FLUSH=1 \ |
| 46 |
- PKGCONFIG="$(tc-getPKG_CONFIG)" |
| 47 |
+ PKGCONFIG="$(tc-getPKG_CONFIG)" \ |
| 48 |
+ GENTOO_CFLAGS="${CFLAGS}" \ |
| 49 |
+ GENTOO_CPPFLAGS="${CPPFLAGS}" \ |
| 50 |
+ FAKEVAR=1 |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
- dodir /sbin /usr/share/man/man{3,5,8} |
| 55 |
+ dodir /sbin |
| 56 |
+ # upstream makefile has terrible $(prefix) choices |
| 57 |
emake \ |
| 58 |
- DESTDIR="${D}" \ |
| 59 |
+ DESTDIR="${ED}" \ |
| 60 |
prefix="${EPREFIX}" \ |
| 61 |
LIB="$(get_libdir)" \ |
| 62 |
RUN=run \ |
| 63 |
unitdir="$(systemd_get_systemunitdir)" \ |
| 64 |
- libudevdir='$(prefix)'/$(get_udevdir) \ |
| 65 |
- pkgconfdir='$(prefix)/usr/$(LIB)/pkgconfig' \ |
| 66 |
+ libudevdir="${EPREFIX}/$(get_udevdir)" \ |
| 67 |
+ pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \ |
| 68 |
+ GENTOO_CFLAGS="${CFLAGS}" \ |
| 69 |
+ GENTOO_CPPFLAGS="${CPPFLAGS}" \ |
| 70 |
install |
| 71 |
+ rmdir "${ED}"/usr/include |
| 72 |
+ rmdir "${ED}"/usr/share |
| 73 |
+ mv "${ED}"/include "${ED}"/usr/include || die |
| 74 |
+ mv "${ED}"/share "${ED}"/usr/share || die |
| 75 |
einstalldocs |
| 76 |
|
| 77 |
newinitd "${FILESDIR}"/multipathd-r1.rc multipathd |
| 78 |
@@ -70,6 +80,7 @@ src_install() { |
| 79 |
} |
| 80 |
|
| 81 |
pkg_postinst() { |
| 82 |
+ tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf |
| 83 |
udev_reload |
| 84 |
|
| 85 |
if [[ -z ${REPLACING_VERSIONS} ]] ; then |
Archives