Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH 4/5] sys-apps/gentoo-systemd-integration: pass systemd dirs to configure
Date: Sat, 18 Sep 2021 14:41:54
Message-Id: 20210918144053.780056-4-floppym@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/5] systemd.eclass: set PKG_CONFIG_FDO_SYSROOT_RULES by Mike Gilbert
1 This prevents install paths from being prefixed with SYSROOT by
2 pkg-config.
3
4 Bug: https://bugs.gentoo.org/813639
5 Signed-off-by: Mike Gilbert <floppym@g.o>
6 ---
7 .../gentoo-systemd-integration-8.ebuild | 10 ++++++++++
8 .../gentoo-systemd-integration-9.ebuild | 12 +++++++++++-
9 .../gentoo-systemd-integration-9999.ebuild | 12 +++++++++++-
10 3 files changed, 32 insertions(+), 2 deletions(-)
11
12 diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
13 index d6fa26516aa..c5acec8fc6d 100644
14 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
15 +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
16 @@ -3,6 +3,8 @@
17
18 EAPI=7
19
20 +inherit systemd
21 +
22 if [[ ${PV} == 9999 ]]; then
23 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
24 inherit autotools git-r3
25 @@ -30,3 +32,11 @@ src_prepare() {
26 default
27 [[ ${PV} != 9999 ]] || eautoreconf
28 }
29 +
30 +src_configure() {
31 + local myconf=(
32 + --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
33 + --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
34 + )
35 + econf "${myconf[@]}"
36 +}
37 diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
38 index 7983540e726..0d5b07883d9 100644
39 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
40 +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
41 @@ -1,8 +1,10 @@
42 -# Copyright 1999-2020 Gentoo Authors
43 +# Copyright 1999-2021 Gentoo Authors
44 # Distributed under the terms of the GNU General Public License v2
45
46 EAPI=7
47
48 +inherit systemd
49 +
50 if [[ ${PV} == 9999 ]]; then
51 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
52 inherit autotools git-r3
53 @@ -28,3 +30,11 @@ src_prepare() {
54 default
55 [[ ${PV} != 9999 ]] || eautoreconf
56 }
57 +
58 +src_configure() {
59 + local myconf=(
60 + --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
61 + --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
62 + )
63 + econf "${myconf[@]}"
64 +}
65 diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
66 index 7983540e726..0d5b07883d9 100644
67 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
68 +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
69 @@ -1,8 +1,10 @@
70 -# Copyright 1999-2020 Gentoo Authors
71 +# Copyright 1999-2021 Gentoo Authors
72 # Distributed under the terms of the GNU General Public License v2
73
74 EAPI=7
75
76 +inherit systemd
77 +
78 if [[ ${PV} == 9999 ]]; then
79 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
80 inherit autotools git-r3
81 @@ -28,3 +30,11 @@ src_prepare() {
82 default
83 [[ ${PV} != 9999 ]] || eautoreconf
84 }
85 +
86 +src_configure() {
87 + local myconf=(
88 + --with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
89 + --with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
90 + )
91 + econf "${myconf[@]}"
92 +}
93 --
94 2.33.0