commit: 28b60013d6c03a8d25143efd9b9901cdad9f8af1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Jun 29 22:55:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 29 22:55:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28b60013
perl-module.eclass: move DIST_MAKE setting into perl-module_src_configure Quoting https://bugs.gentoo.org/959230#c1 > What's interesting is, in https://bugs.gentoo.org/943847#c3, I added > -std=gnu17 > (because dev-perl/Tk is kind of a mess, loads of pending PRs upstream for > Modern C fixes), > but that seems to not be working now with EAPI 8 because of some > perl-module.eclass changes. Move DIST_MAKE into perl-module_src_configure so that append-flags in src_configure works. Acked by dilfridge on IRC. Bug: https://bugs.gentoo.org/943847 Closes: https://bugs.gentoo.org/959230 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/perl-module.eclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 27cd053f0ea7..29b4959bfa98 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: perl-module.eclass @@ -190,9 +190,6 @@ LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" # (EAPI=8 and later) This Bash array contains parameters to the make call # from ExtUtils::MakeMaker. Replaces mymake in EAPI=7 and earlier. # Defaults to ( OPTIMIZE="${CFLAGS}" ) -if [[ $(declare -p DIST_MAKE 2>&-) != "declare -a DIST_MAKE="* ]]; then - DIST_MAKE=( OPTIMIZE="${CFLAGS}" ) -fi DIST_NAME=${DIST_NAME:-${PN}} DIST_P=${DIST_NAME}-${DIST_VERSION:-${PV}} @@ -234,6 +231,10 @@ perl-module_src_prepare() { perl-module_src_configure() { debug-print-function ${FUNCNAME} "$@" + if [[ $(declare -p DIST_MAKE 2>&-) != "declare -a DIST_MAKE="* ]]; then + DIST_MAKE=( OPTIMIZE="${CFLAGS}" ) + fi + # Perl runs LD with LDFLAGS export CCLD=$(tc-getCC) unset LD
