From 65d80628ff6f2a4829b6a904481c52855e85459f Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 24 Apr 2022 10:40:23 -0400 Subject: sys-apps/gentoo-systemd-integration: pass udevdir to configure The get_udevdir helper function calls pkgconf with PKG_CONFIG_FDO_SYSROOT_RULES set. This is necessary to avoid duplicating SYSROOT in the resulting output. Closes: https://bugs.gentoo.org/840550 Signed-off-by: Mike Gilbert --- .../gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild | 3 ++- .../gentoo-systemd-integration-9999.ebuild | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'sys-apps/gentoo-systemd-integration') diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild index c2fc5b4077e5..59c33e356cc6 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit systemd +inherit systemd udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git" @@ -35,6 +35,7 @@ src_configure() { local myconf=( --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)" --with-systemdsystempresetdir="$(systemd_get_systempresetdir)" + udevdir="${EPREFIX}$(get_udevdir)" ) econf "${myconf[@]}" } diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild index 0d5b07883d97..bb66dd8ea452 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit systemd +inherit systemd udev if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git" @@ -35,6 +35,7 @@ src_configure() { local myconf=( --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)" --with-systemdsystempresetdir="$(systemd_get_systempresetdir)" + udevdir="${EPREFIX}$(get_udevdir)" ) econf "${myconf[@]}" } -- cgit v1.2.3-65-gdbad