commit: fae3e3b3eeec2d252ad42afeba11ac8ffeb70c42
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 09:54:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 10:24:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae3e3b3
xorg-3.eclass: cleanup XORG_EAUTORECONF further
The current/previous logic is:
* if `XORG_EAUTORECONF` is explicitly no, just elibtoolize.
* if `XORG_EAUTORECONF` is yes/unset, automagic it based on configure.{ac,in}
presence
* if `XORG_EAUTORECONF` is unset, autoreconf
I don't see the point in the automagic, so clean it up. At best, it papered
over broken ebuilds.
(And it's also dangerous if the deps aren't guaranteed to be installed.)
Closes: https://github.com/gentoo/gentoo/pull/31279
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/xorg-3.eclass | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass
index 74ba29657e64..e0b26acca0b0 100644
--- a/eclass/xorg-3.eclass
+++ b/eclass/xorg-3.eclass
@@ -273,9 +273,11 @@ xorg-3_src_unpack() {
xorg-3_reconf_source() {
debug-print-function ${FUNCNAME} "$@"
- [[ ${XORG_EAUTORECONF} != no && ( -e "./configure.ac" || -e
"./configure.in" ) ]] && XORG_EAUTORECONF=yes
- [[ ${XORG_EAUTORECONF} != no ]] && eautoreconf
- elibtoolize --patch-only
+ if [[ ${XORG_EAUTORECONF} != no ]] ; then
+ eautoreconf
+ else
+ elibtoolize --patch-only
+ fi
}
# @FUNCTION: xorg-3_src_prepare
