* [gentoo-dev] [PATCH v2 1/3] gnuconfig.eclass: add GNUCONFIG_DEPEND
@ 2024-05-03 11:41 Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 2/3] autotools.eclass: conditionalize gnuconfig dependency Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 3/3] gnuconfig.eclass: drop EAPI 5 support Sam James
0 siblings, 2 replies; 3+ messages in thread
From: Sam James @ 2024-05-03 11:41 UTC (permalink / raw)
To: gentoo-dev; +Cc: base-system, Sam James
The motivation here is to allow autotools.eclass consumers setting
AUTOTOOLS_AUTO_DEPEND=no to not have a useless gnuconfig dependency.
Signed-off-by: Sam James <sam@gentoo.org>
---
eclass/gnuconfig.eclass | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index 0791798632cdb..df3c748676082 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: gnuconfig.eclass
@@ -24,9 +24,25 @@ esac
if [[ -z ${_GNUCONFIG_ECLASS} ]] ; then
_GNUCONFIG_CLASS=1
-BDEPEND="sys-devel/gnuconfig"
+# @ECLASS_VARIABLE: GNUCONFIG_DEPEND
+# @OUTPUT_VARIABLE
+# @DESCRIPTION:
+# Contains dependency on gnuconfig in *DEPEND format.
+GNUCONFIG_DEPEND="sys-devel/gnuconfig"
-[[ ${EAPI} == [56] ]] && DEPEND="${BDEPEND}"
+# @ECLASS_VARIABLE: GNUCONFIG_AUTO_DEPEND
+# @PRE_INHERIT
+# @DESCRIPTION:
+# Set to 'no' to disable automatically adding to DEPEND. This lets
+# ebuilds form conditional depends by using ${GNUCONFIG_DEPEND} in
+# their own DEPEND string.
+: "${GNUCONFIG_AUTO_DEPEND:=yes}"
+if [[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] ; then
+ case ${EAPI} in
+ 5|6) DEPEND=${GNUCONFIG_DEPEND} ;;
+ *) BDEPEND=${GNUCONFIG_DEPEND} ;;
+ esac
+fi
# @FUNCTION: gnuconfig_update
# @USAGE: [file1 file2 ...]
--
2.45.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH v2 2/3] autotools.eclass: conditionalize gnuconfig dependency
2024-05-03 11:41 [gentoo-dev] [PATCH v2 1/3] gnuconfig.eclass: add GNUCONFIG_DEPEND Sam James
@ 2024-05-03 11:41 ` Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 3/3] gnuconfig.eclass: drop EAPI 5 support Sam James
1 sibling, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-03 11:41 UTC (permalink / raw)
To: gentoo-dev; +Cc: base-system, Sam James
Use newly-added GNUCONFIG_DEPEND so that AUTOTOOLS_AUTO_DEPEND=no doesn't
result in a useless dependency on gnuconfig.
Signed-off-by: Sam James <sam@gentoo.org>
---
eclass/autotools.eclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 1ced771c5345f..a456e9b9f5898 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -33,6 +33,7 @@ _AUTOTOOLS_ECLASS=1
[[ ${EAPI} == 6 ]] && inherit eqawarn
+GNUCONFIG_AUTO_DEPEND=no
inherit gnuconfig libtool
# @ECLASS_VARIABLE: WANT_AUTOCONF
@@ -164,9 +165,12 @@ fi
# @DESCRIPTION:
# Contains the combination of requested automake/autoconf/libtool
# versions in *DEPEND format.
-AUTOTOOLS_DEPEND="${_automake_atom}
+AUTOTOOLS_DEPEND="
+ ${GNUCONFIG_DEPEND}
+ ${_automake_atom}
${_autoconf_atom}
- ${_libtool_atom}"
+ ${_libtool_atom}
+"
RDEPEND=""
# @ECLASS_VARIABLE: AUTOTOOLS_AUTO_DEPEND
--
2.45.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-dev] [PATCH v2 3/3] gnuconfig.eclass: drop EAPI 5 support
2024-05-03 11:41 [gentoo-dev] [PATCH v2 1/3] gnuconfig.eclass: add GNUCONFIG_DEPEND Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 2/3] autotools.eclass: conditionalize gnuconfig dependency Sam James
@ 2024-05-03 11:41 ` Sam James
1 sibling, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-03 11:41 UTC (permalink / raw)
To: gentoo-dev; +Cc: base-system, Sam James
autotools.eclass hasn't had EAPI 5 support for ~2 years since
50710f3d0e8f19fab5571d9596c336314e96b5cf so this wasn't being used
anyway (non-autotools.eclass use of gnuconfig.eclass is very niche).
Signed-off-by: Sam James <sam@gentoo.org>
---
eclass/gnuconfig.eclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/gnuconfig.eclass b/eclass/gnuconfig.eclass
index df3c748676082..fb73087aeacf4 100644
--- a/eclass/gnuconfig.eclass
+++ b/eclass/gnuconfig.eclass
@@ -6,7 +6,7 @@
# Sam James <sam@gentoo.org>
# @AUTHOR:
# Will Woods <wwoods@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 6 7 8
# @BLURB: Refresh bundled gnuconfig files (config.guess, config.sub)
# @DESCRIPTION:
# This eclass is used to automatically update files that typically come with
@@ -17,7 +17,7 @@
#
case ${EAPI:-0} in
- 5|6|7|8) ;;
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -39,7 +39,7 @@ GNUCONFIG_DEPEND="sys-devel/gnuconfig"
: "${GNUCONFIG_AUTO_DEPEND:=yes}"
if [[ ${GNUCONFIG_AUTO_DEPEND} != "no" ]] ; then
case ${EAPI} in
- 5|6) DEPEND=${GNUCONFIG_DEPEND} ;;
+ 6) DEPEND=${GNUCONFIG_DEPEND} ;;
*) BDEPEND=${GNUCONFIG_DEPEND} ;;
esac
fi
@@ -122,7 +122,7 @@ gnuconfig_findnewest() {
local prefix
case ${EAPI} in
- 5|6)
+ 6)
prefix="${EPREFIX}"
;;
*)
--
2.45.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-03 11:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-03 11:41 [gentoo-dev] [PATCH v2 1/3] gnuconfig.eclass: add GNUCONFIG_DEPEND Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 2/3] autotools.eclass: conditionalize gnuconfig dependency Sam James
2024-05-03 11:41 ` [gentoo-dev] [PATCH v2 3/3] gnuconfig.eclass: drop EAPI 5 support Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox