Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: freedesktop-bugs@g.o
Subject: [gentoo-dev] [PATCH] xdg-utils.eclass: don't call binaries from ROOT
Date: Wed, 03 Oct 2018 02:16:48
Message-Id: 20181003021638.2475-1-floppym@gentoo.org
1 Avoid calling binaries that may have been compiled against different
2 libraries or even cross-compiled for an incomatible arch.
3
4 Instead, always call the binaries installed in BROOT (/), if available.
5
6 Signed-off-by: Mike Gilbert <floppym@g.o>
7 ---
8 eclass/xdg-utils.eclass | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11 diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass
12 index fe1eef213ea4..b133de093082 100644
13 --- a/eclass/xdg-utils.eclass
14 +++ b/eclass/xdg-utils.eclass
15 @@ -67,7 +67,7 @@ xdg_environment_reset() {
16 # Updates the .desktop files database.
17 # Generates a list of mimetypes linked to applications that can handle them
18 xdg_desktop_database_update() {
19 - local updater="${EROOT%/}${DESKTOP_DATABASE_UPDATE_BIN}"
20 + local updater="${EPREFIX}${DESKTOP_DATABASE_UPDATE_BIN}"
21
22 if [[ ${EBUILD_PHASE} != post* ]] ; then
23 die "xdg_desktop_database_update must be used in pkg_post* phases."
24 @@ -88,7 +88,7 @@ xdg_desktop_database_update() {
25 # Update the mime database.
26 # Creates a general list of mime types from several sources
27 xdg_mimeinfo_database_update() {
28 - local updater="${EROOT%/}${MIMEINFO_DATABASE_UPDATE_BIN}"
29 + local updater="${EPREFIX}${MIMEINFO_DATABASE_UPDATE_BIN}"
30
31 if [[ ${EBUILD_PHASE} != post* ]] ; then
32 die "xdg_mimeinfo_database_update must be used in pkg_post* phases."
33 --
34 2.19.0

Replies