commit: 29f1e814f6c781e3809710b8b9a75024639ec0bf Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Apr 24 15:12:03 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Apr 24 15:14:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29f1e814
sys-fs/lvm2: pass systemdutildir to make install configure always calls pkg-config, and offers no way to override this variable. We need to call pkg-config with PKG_CONFIG_FDO_SYSROOT_RULES set to avoid duplicating SYSROOT in the install paths. systemd_get_utildir takes care of that for us. Closes: https://bugs.gentoo.org/840577 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-fs/lvm2/lvm2-2.02.188-r2.ebuild | 12 +++++------- sys-fs/lvm2/lvm2-2.03.14-r1.ebuild | 10 ++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild index 60cc0d980580..a3e76755f1d5 100644 --- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -207,14 +207,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper diff --git a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild index 2ea2eaea55a6..47a08cc12e78 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild @@ -206,14 +206,12 @@ src_compile() { } src_install() { - local inst INSTALL_TARGETS - INSTALL_TARGETS=( install install_tmpfiles_configuration ) + local inst + local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use systemd && INSTALL_TARGETS+=( systemdutildir="$(systemd_get_utildir)" install_systemd_units install_systemd_generators ) use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) - for inst in ${INSTALL_TARGETS[@]}; do - emake V=1 DESTDIR="${D}" ${inst} - done + emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
