| 1 |
commit: d2ccfa6c9af38d82d01fe63a73faa4f14a7ba18e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 21 23:49:39 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 21 23:49:39 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ccfa6c |
| 7 |
|
| 8 |
app-shells/bash: use system readline 8.2_alpha for 5.2_alpha |
| 9 |
|
| 10 |
Added a note to tidy up the logic in future too. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
app-shells/bash/bash-5.2_alpha.ebuild | 9 ++++++++- |
| 15 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-shells/bash/bash-5.2_alpha.ebuild b/app-shells/bash/bash-5.2_alpha.ebuild |
| 18 |
index 61a2aecd2b7c..99181307ddc7 100644 |
| 19 |
--- a/app-shells/bash/bash-5.2_alpha.ebuild |
| 20 |
+++ b/app-shells/bash/bash-5.2_alpha.ebuild |
| 21 |
@@ -3,6 +3,12 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
+# TODO on release: |
| 26 |
+# - check READLINE_VER, obviously |
| 27 |
+# - remove autotools/eautoreconf from readline ebuild |
| 28 |
+# - tidy up is_release check in this ebuild for using system readline |
| 29 |
+# (presumably there weren't always readline releases for bash RCs etc) |
| 30 |
+ |
| 31 |
inherit flag-o-matic toolchain-funcs prefix |
| 32 |
|
| 33 |
# Official patchlevel |
| 34 |
@@ -154,7 +160,8 @@ src_configure() { |
| 35 |
# is at least what's in the DEPEND up above. |
| 36 |
export ac_cv_rl_version=${READLINE_VER%%_*} |
| 37 |
|
| 38 |
- if is_release ; then |
| 39 |
+ # TODO: Clean this up before 5.2 release |
| 40 |
+ if [[ ${PV} == 5.2_alpha ]] || is_release ; then |
| 41 |
# Use system readline only with released versions. |
| 42 |
myconf+=( --with-installed-readline=. ) |
| 43 |
fi |
Archives