| 1 |
--- |
| 2 |
eclass/libtool.eclass | 14 +++----------- |
| 3 |
1 file changed, 3 insertions(+), 11 deletions(-) |
| 4 |
|
| 5 |
diff --git a/eclass/libtool.eclass b/eclass/libtool.eclass |
| 6 |
index a8df6ca58fef..037a6a2734df 100644 |
| 7 |
--- a/eclass/libtool.eclass |
| 8 |
+++ b/eclass/libtool.eclass |
| 9 |
@@ -16,18 +16,10 @@ |
| 10 |
if [[ -z ${_LIBTOOL_ECLASS} ]]; then |
| 11 |
_LIBTOOL_ECLASS=1 |
| 12 |
|
| 13 |
-# If an overlay has eclass overrides, but doesn't actually override the |
| 14 |
-# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's |
| 15 |
-# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So |
| 16 |
-# add a check to locate the ELT-patches/ regardless of what's going on. |
| 17 |
-# Note: Duplicated in eutils.eclass. |
| 18 |
-_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*} |
| 19 |
+DEPEND=">=app-portage/elt-patches-20170317" |
| 20 |
+ |
| 21 |
libtool_elt_patch_dir() { |
| 22 |
- local d="${ECLASSDIR}/ELT-patches" |
| 23 |
- if [[ ! -d ${d} ]] ; then |
| 24 |
- d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches" |
| 25 |
- fi |
| 26 |
- echo "${d}" |
| 27 |
+ echo /usr/share/elt-patches |
| 28 |
} |
| 29 |
|
| 30 |
inherit multilib toolchain-funcs |
| 31 |
-- |
| 32 |
2.12.0 |
Archives