[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gentoo-dev
Subject:    [gentoo-dev] [PATCH 4/5] sys-apps/gentoo-systemd-integration: pass systemd dirs to configure
From:       Mike Gilbert <floppym () gentoo ! org>
Date:       2021-09-18 14:40:52
Message-ID: 20210918144053.780056-4-floppym () gentoo ! org
[Download RAW message or body]

This prevents install paths from being prefixed with SYSROOT by
pkg-config.

Bug: https://bugs.gentoo.org/813639
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---
 .../gentoo-systemd-integration-8.ebuild              | 10 ++++++++++
 .../gentoo-systemd-integration-9.ebuild              | 12 +++++++++++-
 .../gentoo-systemd-integration-9999.ebuild           | 12 +++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild \
b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild index \
                d6fa26516aa..c5acec8fc6d 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit systemd
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
@@ -30,3 +32,11 @@ src_prepare() {
 	default
 	[[ ${PV} != 9999 ]] || eautoreconf
 }
+
+src_configure() {
+	local myconf=(
+		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+	)
+	econf "${myconf[@]}"
+}
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 \
                7983540e726..0d5b07883d9 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit systemd
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
@@ -28,3 +30,11 @@ src_prepare() {
 	default
 	[[ ${PV} != 9999 ]] || eautoreconf
 }
+
+src_configure() {
+	local myconf=(
+		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+	)
+	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 \
                7983540e726..0d5b07883d9 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit systemd
+
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
@@ -28,3 +30,11 @@ src_prepare() {
 	default
 	[[ ${PV} != 9999 ]] || eautoreconf
 }
+
+src_configure() {
+	local myconf=(
+		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
+		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+	)
+	econf "${myconf[@]}"
+}
-- 
2.33.0


[prev in list] [next in list] [prev in thread] [next in thread]