commit: 5bc696cb73b16a50be83fede86c06282d0abe963
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 16 22:20:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 00:00:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc696cb
toolchain-autoconf.eclass: handle different PN
Prepare for autoconf-vanilla.
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/toolchain-autoconf.eclass | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
index ed8d5ff1412a..0211d810f6a2 100644
--- a/eclass/toolchain-autoconf.eclass
+++ b/eclass/toolchain-autoconf.eclass
@@ -30,7 +30,7 @@ _TOOLCHAIN_AUTOCONF_ECLASS=1
# @ECLASS_VARIABLE: TC_AUTOCONF_INFOPATH
# @DESCRIPTION:
# Where to install info files if not slotting.
-TC_AUTOCONF_INFOPATH="${EPREFIX}/usr/share/autoconf-${PV}/info"
+TC_AUTOCONF_INFOPATH="${EPREFIX}/usr/share/${P}/info"
toolchain-autoconf_src_prepare() {
find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} +
|| die
@@ -40,8 +40,11 @@ toolchain-autoconf_src_prepare() {
toolchain-autoconf_src_configure() {
# Disable Emacs in the build system since it is in a separate package.
export EMACS=no
+
+ MY_P="${P#autoconf-}"
+
local myconf=(
- --program-suffix="-${PV}"
+ --program-suffix="-${MY_P}"
)
if [[ -z "${TC_AUTOCONF_BREAK_INFOS}" && "${SLOT}" != 0 ]]; then
myconf+=(