Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Fri, 27 Jul 2018 13:05:28
Message-Id: 1532696616.9d292c8697649d99b24393ccc308fb2c736b1d31.mgorny@gentoo
1 commit: 9d292c8697649d99b24393ccc308fb2c736b1d31
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 27 13:03:36 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 27 13:03:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d292c86
7
8 eclass/udev.eclass: [QA] Revert "unconditional udevdir."
9
10 This change breaks installs using a different udevdir. Please remember
11 to submit patches for widely-used eclasses to gentoo-dev for review.
12
13 Acked-by: Amy Liffey <amynka <AT> gentoo.org>
14 Reverts: 7df145403c61bfec4b4921b7e275e127b8877b37
15
16 eclass/udev.eclass | 8 +++++++-
17 1 file changed, 7 insertions(+), 1 deletion(-)
18
19 diff --git a/eclass/udev.eclass b/eclass/udev.eclass
20 index 96c723317c9..b7c6461dd8f 100644
21 --- a/eclass/udev.eclass
22 +++ b/eclass/udev.eclass
23 @@ -44,7 +44,13 @@ DEPEND="virtual/pkgconfig"
24 # @INTERNAL
25 # @DESCRIPTION:
26 # Get unprefixed udevdir.
27 -_udev_get_udevdir() { echo /lib/udev; }
28 +_udev_get_udevdir() {
29 + if $($(tc-getPKG_CONFIG) --exists udev); then
30 + echo "$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
31 + else
32 + echo /lib/udev
33 + fi
34 +}
35
36 # @FUNCTION: udev_get_udevdir
37 # @DESCRIPTION: