Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: freedesktop-bugs@g.o
Subject: Re: [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT
Date: Wed, 03 Oct 2018 07:34:03
Message-Id: 1538552033.1042.0.camel@gentoo.org
In Reply to: [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT by Mike Gilbert
1 On Tue, 2018-10-02 at 22:16 -0400, Mike Gilbert wrote:
2 > Avoid calling binaries that may have been compiled against different
3 > libraries or even cross-compiled for an incomatible arch.
4 >
5 > Instead, always call the binaries installed in BROOT (/), if available.
6
7 Except BROOT doesn't have to be / (that's why we made it into
8 a variable)! Also, wouldn't it be sufficient to use PATH lookup here
9 and let the PM handle providing the correct root?
10
11 >
12 > Signed-off-by: Mike Gilbert <floppym@g.o>
13 > ---
14 > eclass/xdg-utils.eclass | 4 ++--
15 > 1 file changed, 2 insertions(+), 2 deletions(-)
16 >
17 > diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
18 > index fe1eef213ea4..b133de093082 100644
19 > --- a/eclass/xdg-utils.eclass
20 > +++ b/eclass/xdg-utils.eclass
21 > @@ -67,7 +67,7 @@ xdg_environment_reset() {
22 > # Updates the .desktop files database.
23 > # Generates a list of mimetypes linked to applications that can handle them
24 > xdg_desktop_database_update() {
25 > - local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
26 > + local updater="${EPREFIX}${DESKTOP_DATABASE_UPDATE_BIN}"
27 >
28 > if [[ ${EBUILD_PHASE} != post* ]] ; then
29 > die "xdg_desktop_database_update must be used in pkg_post* phases."
30 > @@ -88,7 +88,7 @@ xdg_desktop_database_update() {
31 > # Update the mime database.
32 > # Creates a general list of mime types from several sources
33 > xdg_mimeinfo_database_update() {
34 > - local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
35 > + local updater="${EPREFIX}${MIMEINFO_DATABASE_UPDATE_BIN}"
36 >
37 > if [[ ${EBUILD_PHASE} != post* ]] ; then
38 > die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
39
40 --
41 Best regards,
42 Michał Górny

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies