1 |
On Fri, Mar 17, 2017 at 4:11 PM, Michał Górny <mgorny@g.o> wrote: |
2 |
> On pią, 2017-03-17 at 15:47 -0400, Mike Gilbert wrote: |
3 |
>> On Fri, Mar 17, 2017 at 2:48 PM, Michał Górny <mgorny@g.o> wrote: |
4 |
>> > --- |
5 |
>> > eclass/libtool.eclass | 14 +++----------- |
6 |
>> > 1 file changed, 3 insertions(+), 11 deletions(-) |
7 |
>> > |
8 |
>> > diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass |
9 |
>> > index a8df6ca58fef..037a6a2734df 100644 |
10 |
>> > --- a/eclass/libtool.eclass |
11 |
>> > +++ b/eclass/libtool.eclass |
12 |
>> > @@ -16,18 +16,10 @@ |
13 |
>> > if [[ -z ${_LIBTOOL_ECLASS} ]]; then |
14 |
>> > _LIBTOOL_ECLASS=1 |
15 |
>> > |
16 |
>> > -# If an overlay has eclass overrides, but doesn't actually override the |
17 |
>> > -# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's |
18 |
>> > -# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So |
19 |
>> > -# add a check to locate the ELT-patches/ regardless of what's going on. |
20 |
>> > -# Note: Duplicated in eutils.eclass. |
21 |
>> > -_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} |
22 |
>> > +DEPEND=">=app-portage/elt-patches-20170317" |
23 |
>> > + |
24 |
>> > libtool_elt_patch_dir() { |
25 |
>> > - local d="${ECLASSDIR}/ELT-patches" |
26 |
>> > - if [[ ! -d ${d} ]] ; then |
27 |
>> > - d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" |
28 |
>> > - fi |
29 |
>> > - echo "${d}" |
30 |
>> > + echo /usr/share/elt-patches |
31 |
>> |
32 |
>> I think this should probably be "${EPREFIX}/usr/share/elt-patches". |
33 |
> |
34 |
> Makes sense. Do we still do the 'use prefix' hoops for old EAPIs, or |
35 |
> just ${EPREFIX} these days? |
36 |
|
37 |
I'm not sure what hoops you are referring to, but I think we can just |
38 |
use ${EPREFIX} unconditionally here. It's not formally defined before |
39 |
EAPI 3, but it probably works anyway. |