From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B00E4158074 for ; Sun, 29 Jun 2025 22:57:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 92EB6341E62 for ; Sun, 29 Jun 2025 22:57:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9154B110320; Sun, 29 Jun 2025 22:57:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 872F5110320 for ; Sun, 29 Jun 2025 22:57:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C0C23417EB for ; Sun, 29 Jun 2025 22:57:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB19EDA0 for ; Sun, 29 Jun 2025 22:57:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1751237755.28b60013d6c03a8d25143efd9b9901cdad9f8af1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/perl-module.eclass X-VCS-Directories: eclass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 28b60013d6c03a8d25143efd9b9901cdad9f8af1 X-VCS-Branch: master Date: Sun, 29 Jun 2025 22:57:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c536b30e-8d34-4384-8e87-401837ae5f61 X-Archives-Hash: 0ef8cafa8baa7bd45634f6677e51b080 commit: 28b60013d6c03a8d25143efd9b9901cdad9f8af1 Author: Sam James gentoo org> AuthorDate: Sun Jun 29 22:55:55 2025 +0000 Commit: Sam James gentoo 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 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