diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-11-22 19:24:25 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-11-22 19:24:33 -0500 |
| commit | cdcebd4db4693bb994dc682b72a3eb593a08e4bf (patch) | |
| tree | ea8d1b41378692680a5086115f68e07cb4db267f /eclass/libtool.eclass | |
| parent | kernel-2.eclass: use experimental in global scope (diff) | |
| download | gentoo-cdcebd4db4693bb994dc682b72a3eb593a08e4bf.tar.gz gentoo-cdcebd4db4693bb994dc682b72a3eb593a08e4bf.tar.bz2 gentoo-cdcebd4db4693bb994dc682b72a3eb593a08e4bf.zip | |
eutils.eclass: copy over logic from libtool.eclass to find ELT-patches dir #517752
Diffstat (limited to 'eclass/libtool.eclass')
| -rw-r--r-- | eclass/libtool.eclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass index 090c65769830..9434480b25eb 100644 --- a/eclass/libtool.eclass +++ b/eclass/libtool.eclass @@ -21,8 +21,9 @@ _LIBTOOL_ECLASS=1 # 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=${BASH_SOURCE[0]%/*} -elt_patch_dir() { +libtool_elt_patch_dir() { local d="${ECLASSDIR}/ELT-patches" if [[ ! -d ${d} ]] ; then d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" @@ -92,7 +93,7 @@ ELT_walk_patches() { local ret=1 local file=$1 local patch_set=$2 - local patch_dir="$(elt_patch_dir)/${patch_set}" + local patch_dir="$(libtool_elt_patch_dir)/${patch_set}" local rem_int_dep=$3 [[ -z ${patch_set} ]] && return 1 @@ -106,7 +107,7 @@ ELT_walk_patches() { sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ) fi - pushd "$(elt_patch_dir)" >/dev/null || die + pushd "$(libtool_elt_patch_dir)" >/dev/null || die # Go through the patches in reverse order (newer version to older) for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do |