* [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
@ 2017-04-22 8:20 Michał Górny
2017-04-22 17:43 ` Mike Gilbert
0 siblings, 1 reply; 6+ messages in thread
From: Michał Górny @ 2017-04-22 8:20 UTC (permalink / raw
To: gentoo-dev; +Cc: gnome, Michał Górny
Respect EROOT when running gtk-query-immodules-* tools, alike other
updaters in the eclass. This ensures that x11-libs/gtk+ installs
correctly when installing to a ROOT.
---
eclass/gnome2-utils.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index f2aa2391a532..c0cb209cddd9 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -445,8 +445,8 @@ gnome2_gdk_pixbuf_update() {
# @DESCRIPTION:
# Updates gtk2 immodules/gdk-pixbuf loaders listing.
gnome2_query_immodules_gtk2() {
- local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-2.0
- [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-2.0
+ local updater=${EROOT}/usr/bin/${CHOST}-gtk-query-immodules-2.0
+ [[ ! -x ${updater} ]] && updater=${EROOT}/usr/bin/gtk-query-immodules-2.0
ebegin "Updating gtk2 input method module cache"
GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" \
@@ -459,8 +459,8 @@ gnome2_query_immodules_gtk2() {
# @DESCRIPTION:
# Updates gtk3 immodules/gdk-pixbuf loaders listing.
gnome2_query_immodules_gtk3() {
- local updater=${EPREFIX}/usr/bin/${CHOST}-gtk-query-immodules-3.0
- [[ ! -x ${updater} ]] && updater=${EPREFIX}/usr/bin/gtk-query-immodules-3.0
+ local updater=${EROOT}/usr/bin/${CHOST}-gtk-query-immodules-3.0
+ [[ ! -x ${updater} ]] && updater=${EROOT}/usr/bin/gtk-query-immodules-3.0
ebegin "Updating gtk3 input method module cache"
GTK_IM_MODULE_FILE="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" \
--
2.12.2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
2017-04-22 8:20 [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030 Michał Górny
@ 2017-04-22 17:43 ` Mike Gilbert
2017-04-22 17:48 ` Mike Gilbert
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Mike Gilbert @ 2017-04-22 17:43 UTC (permalink / raw
To: Gentoo Dev; +Cc: gnome, Michał Górny
On Sat, Apr 22, 2017 at 4:20 AM, Michał Górny <mgorny@gentoo.org> wrote:
> Respect EROOT when running gtk-query-immodules-* tools, alike other
> updaters in the eclass. This ensures that x11-libs/gtk+ installs
> correctly when installing to a ROOT.
I'm not an expert on this eclass, but it seems like this may be
intentional; calling compiled binaries from $ROOT will break for
cross-compiles.
Is there some package that installs ${CHOST}-gtk-query-immodules-X.0
for ROOT == /? I don't have any such binary on my system.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
2017-04-22 17:43 ` Mike Gilbert
@ 2017-04-22 17:48 ` Mike Gilbert
2017-04-22 17:53 ` Alexis Ballier
2017-04-22 21:03 ` Michał Górny
2 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2017-04-22 17:48 UTC (permalink / raw
To: Gentoo Dev; +Cc: gnome, Michał Górny
On Sat, Apr 22, 2017 at 1:43 PM, Mike Gilbert <floppym@gentoo.org> wrote:
> On Sat, Apr 22, 2017 at 4:20 AM, Michał Górny <mgorny@gentoo.org> wrote:
>> Respect EROOT when running gtk-query-immodules-* tools, alike other
>> updaters in the eclass. This ensures that x11-libs/gtk+ installs
>> correctly when installing to a ROOT.
>
> I'm not an expert on this eclass, but it seems like this may be
> intentional; calling compiled binaries from $ROOT will break for
> cross-compiles.
>
> Is there some package that installs ${CHOST}-gtk-query-immodules-X.0
> for ROOT == /? I don't have any such binary on my system.
I take that last part back, I do have CHOST prefixed binaries.
% ls -l /usr/bin/gtk-query-immodules*
lrwxrwxrwx 1 root root 43 Mar 25 18:45
/usr/bin/gtk-query-immodules-2.0 ->
x86_64-pc-linux-gnu-gtk-query-immodules-2.0
lrwxrwxrwx 1 root root 43 Apr 13 11:43
/usr/bin/gtk-query-immodules-3.0 ->
x86_64-pc-linux-gnu-gtk-query-immodules-3.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
2017-04-22 17:43 ` Mike Gilbert
2017-04-22 17:48 ` Mike Gilbert
@ 2017-04-22 17:53 ` Alexis Ballier
2017-04-22 21:03 ` Michał Górny
2 siblings, 0 replies; 6+ messages in thread
From: Alexis Ballier @ 2017-04-22 17:53 UTC (permalink / raw
To: gentoo-dev
On Sat, 22 Apr 2017 13:43:21 -0400
Mike Gilbert <floppym@gentoo.org> wrote:
> On Sat, Apr 22, 2017 at 4:20 AM, Michał Górny <mgorny@gentoo.org>
> wrote:
> > Respect EROOT when running gtk-query-immodules-* tools, alike other
> > updaters in the eclass. This ensures that x11-libs/gtk+ installs
> > correctly when installing to a ROOT.
>
> I'm not an expert on this eclass, but it seems like this may be
> intentional; calling compiled binaries from $ROOT will break for
> cross-compiles.
yes, I think calling binaries from EROOT is wrong; it should call
binaries from EPREFIX with arguments in EROOT; it's likely the other
functions in the eclass are wrong on that
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
2017-04-22 17:43 ` Mike Gilbert
2017-04-22 17:48 ` Mike Gilbert
2017-04-22 17:53 ` Alexis Ballier
@ 2017-04-22 21:03 ` Michał Górny
2017-04-25 11:41 ` Gilles Dartiguelongue
2 siblings, 1 reply; 6+ messages in thread
From: Michał Górny @ 2017-04-22 21:03 UTC (permalink / raw
To: gentoo-dev; +Cc: gnome
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
On sob, 2017-04-22 at 13:43 -0400, Mike Gilbert wrote:
> On Sat, Apr 22, 2017 at 4:20 AM, Michał Górny <mgorny@gentoo.org> wrote:
> > Respect EROOT when running gtk-query-immodules-* tools, alike other
> > updaters in the eclass. This ensures that x11-libs/gtk+ installs
> > correctly when installing to a ROOT.
>
> I'm not an expert on this eclass, but it seems like this may be
> intentional; calling compiled binaries from $ROOT will break for
> cross-compiles.
>
> Is there some package that installs ${CHOST}-gtk-query-immodules-X.0
> for ROOT == /? I don't have any such binary on my system.
>
I was thinking about this possibility too but it doesn't look like any
of the remaining code was done like this, nor the GTK+ ebuild which
calls this function. But I'll wait for the GNOME team to confirm what
they want.
--
Best regards,
Michał Górny
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030
2017-04-22 21:03 ` Michał Górny
@ 2017-04-25 11:41 ` Gilles Dartiguelongue
0 siblings, 0 replies; 6+ messages in thread
From: Gilles Dartiguelongue @ 2017-04-25 11:41 UTC (permalink / raw
To: gentoo-dev
[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]
Le samedi 22 avril 2017 à 23:03 +0200, Michał Górny a écrit :
> On sob, 2017-04-22 at 13:43 -0400, Mike Gilbert wrote:
> >
> > On Sat, Apr 22, 2017 at 4:20 AM, Michał Górny <mgorny@gentoo.org>
> > wrote:
> > >
> > > Respect EROOT when running gtk-query-immodules-* tools, alike
> > > other
> > > updaters in the eclass. This ensures that x11-libs/gtk+ installs
> > > correctly when installing to a ROOT.
> >
> > I'm not an expert on this eclass, but it seems like this may be
> > intentional; calling compiled binaries from $ROOT will break for
> > cross-compiles.
> >
> > Is there some package that installs ${CHOST}-gtk-query-immodules-
> > X.0
> > for ROOT == /? I don't have any such binary on my system.
> >
>
> I was thinking about this possibility too but it doesn't look like
> any
> of the remaining code was done like this, nor the GTK+ ebuild which
> calls this function. But I'll wait for the GNOME team to confirm what
> they want.
>
Looking at the ebuilds, it looks like your patch is correct. I honestly
cannot remember why we used EPREFIX and not EROOT.
--
Gilles Dartiguelongue <eva@gentoo.org>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 216 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-04-25 11:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-22 8:20 [gentoo-dev] [PATCH] gnome2-utils.eclass: gnome2_query_immodules*, use EROOT, #611030 Michał Górny
2017-04-22 17:43 ` Mike Gilbert
2017-04-22 17:48 ` Mike Gilbert
2017-04-22 17:53 ` Alexis Ballier
2017-04-22 21:03 ` Michał Górny
2017-04-25 11:41 ` Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox