| 1 |
commit: ad85a0fc3941ce75a9dd38f41fbfd939ce46522c |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 3 18:51:01 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 9 21:21:23 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad85a0fc |
| 7 |
|
| 8 |
toolchain-glibc.eclass: Do not export any phases in EAPI=6. Well. Nearly. |
| 9 |
|
| 10 |
eclass/toolchain-glibc.eclass | 9 ++++++++- |
| 11 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass |
| 14 |
index 18c1e2f0a83..33f27ccf46e 100644 |
| 15 |
--- a/eclass/toolchain-glibc.eclass |
| 16 |
+++ b/eclass/toolchain-glibc.eclass |
| 17 |
@@ -19,9 +19,10 @@ case ${EAPI:-0} in |
| 18 |
src_install pkg_preinst pkg_postinst;; |
| 19 |
2|3) EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure \ |
| 20 |
src_compile src_test src_install pkg_preinst pkg_postinst;; |
| 21 |
- 4|5|6) EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare \ |
| 22 |
+ 4|5) EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare \ |
| 23 |
src_configure src_compile src_test src_install \ |
| 24 |
pkg_preinst pkg_postinst;; |
| 25 |
+ 6) EXPORT_FUNCTIONS pkg_pretend;; |
| 26 |
*) die "Unsupported EAPI=${EAPI}";; |
| 27 |
esac |
| 28 |
|
| 29 |
@@ -481,6 +482,12 @@ check_devpts() { |
| 30 |
} |
| 31 |
|
| 32 |
toolchain-glibc_pkg_pretend() { |
| 33 |
+ if [[ ${EAPI:-0} == 6 ]]; then |
| 34 |
+ eerror "We're moving code back to the ebuilds to get away from the ancient EAPI cruft." |
| 35 |
+ eerror "From EAPI=6 on you'll have to define the phases in the glibc ebuilds." |
| 36 |
+ die "Silly overlay authors..." |
| 37 |
+ fi |
| 38 |
+ |
| 39 |
# For older EAPIs, this is run in pkg_preinst. |
| 40 |
if [[ ${EAPI:-0} != [0123] ]] ; then |
| 41 |
check_devpts |
Archives