From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5911139694 for ; Fri, 17 Mar 2017 19:47:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70FF921C112; Fri, 17 Mar 2017 19:47:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27C8D21C082 for ; Fri, 17 Mar 2017 19:47:36 +0000 (UTC) Received: from mail-qk0-f178.google.com (mail-qk0-f178.google.com [209.85.220.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id EEC42341130 for ; Fri, 17 Mar 2017 19:47:34 +0000 (UTC) Received: by mail-qk0-f178.google.com with SMTP id y76so73089224qkb.0 for ; Fri, 17 Mar 2017 12:47:34 -0700 (PDT) X-Gm-Message-State: AFeK/H0/J6DxPMqOYj6ajl2oPfue9ZRxwwxx8Z439NeKvnAnE1qVYCoY/0awqAk4OUDJbJ701nt47am04XiCGw== X-Received: by 10.55.184.65 with SMTP id i62mr15966336qkf.234.1489780052867; Fri, 17 Mar 2017 12:47:32 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Received: by 10.200.45.11 with HTTP; Fri, 17 Mar 2017 12:47:12 -0700 (PDT) In-Reply-To: <20170317184859.4348-3-mgorny@gentoo.org> References: <20170317184859.4348-1-mgorny@gentoo.org> <20170317184859.4348-3-mgorny@gentoo.org> From: Mike Gilbert Date: Fri, 17 Mar 2017 15:47:12 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [gentoo-dev] [PATCH 2/3] libtool.eclass: Use app-portage/elt-patches to provide patch files To: Gentoo Dev Cc: =?UTF-8?B?TWljaGHFgiBHw7Nybnk=?= Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d00cb930-2ea4-4aea-9500-ee4287b32794 X-Archives-Hash: cf08c57199954e90ded6dcf9a960ee2f On Fri, Mar 17, 2017 at 2:48 PM, Micha=C5=82 G=C3=B3rny = wrote: > --- > eclass/libtool.eclass | 14 +++----------- > 1 file changed, 3 insertions(+), 11 deletions(-) > > diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass > index a8df6ca58fef..037a6a2734df 100644 > --- a/eclass/libtool.eclass > +++ b/eclass/libtool.eclass > @@ -16,18 +16,10 @@ > if [[ -z ${_LIBTOOL_ECLASS} ]]; then > _LIBTOOL_ECLASS=3D1 > > -# If an overlay has eclass overrides, but doesn't actually override the > -# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's > -# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So > -# add a check to locate the ELT-patches/ regardless of what's going on. > -# Note: Duplicated in eutils.eclass. > -_LIBTOOL_ECLASSDIR_LOCAL=3D${BASH_SOURCE[0]%/*} > +DEPEND=3D">=3Dapp-portage/elt-patches-20170317" > + > libtool_elt_patch_dir() { > - local d=3D"${ECLASSDIR}/ELT-patches" > - if [[ ! -d ${d} ]] ; then > - d=3D"${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" > - fi > - echo "${d}" > + echo /usr/share/elt-patches I think this should probably be "${EPREFIX}/usr/share/elt-patches".