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 1/3] udev.eclass: rework _udev_get_udevdir
Date: Sun, 03 Jan 2021 17:00:25
Message-Id: 20210103165941.1189260-1-floppym@gentoo.org
1 Rewrite logic to resemble _systemd_get_dir from systemd.eclass.
2
3 Remove incorrect command substitution: pkg-config --exists does not
4 write to stdout.
5
6 Die when pkg-config --variable fails.
7
8 Signed-off-by: Mike Gilbert <floppym@g.o>
9 ---
10 eclass/udev.eclass | 10 +++++-----
11 1 file changed, 5 insertions(+), 5 deletions(-)
12
13 diff --git a/eclass/udev.eclass b/eclass/udev.eclass
14 index 2873ae9a92c3..9a65b080f171 100644
15 --- a/eclass/udev.eclass
16 +++ b/eclass/udev.eclass
17 @@ -50,12 +50,12 @@ fi
18 # @DESCRIPTION:
19 # Get unprefixed udevdir.
20 _udev_get_udevdir() {
21 - if $($(tc-getPKG_CONFIG) --exists udev); then
22 - local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
23 - echo "${udevdir#${EPREFIX%/}}"
24 - else
25 - echo /lib/udev
26 + local udevdir="/lib/udev"
27 + if $(tc-getPKG_CONFIG) --exists udev; then
28 + udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" || die
29 + udevdir="${udevdir#${EPREFIX}}"
30 fi
31 + echo "${udevdir}"
32 }
33
34 # @FUNCTION: udev_get_udevdir
35 --
36 2.30.0

Replies