From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 87EDF15838C for ; Sat, 20 Jan 2024 12:04:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 356ADE29FE; Sat, 20 Jan 2024 12:04:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 1F49CE29FE for ; Sat, 20 Jan 2024 12:04:11 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8FAE343293 for ; Sat, 20 Jan 2024 12:04:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4302814B5 for ; Sat, 20 Jan 2024 12:04:08 +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: <1705752021.842c2e9bff302de882b067103e3abf20568e2ee8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/files/, dev-lang/perl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch dev-lang/perl/perl-5.36.1-r3.ebuild dev-lang/perl/perl-5.38.0-r1.ebuild dev-lang/perl/perl-5.38.2-r1.ebuild X-VCS-Directories: dev-lang/perl/ dev-lang/perl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 842c2e9bff302de882b067103e3abf20568e2ee8 X-VCS-Branch: master Date: Sat, 20 Jan 2024 12:04:08 +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: c810271e-ff15-4ba2-8a21-5ce2be5230db X-Archives-Hash: 33bfe7a17fbc24121b8d80a302683274 commit: 842c2e9bff302de882b067103e3abf20568e2ee8 Author: Raul E Rangel chromium org> AuthorDate: Thu May 18 18:32:34 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jan 20 12:00:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842c2e9b dev-lang/perl: Fix clang check in configure The check was a bit too strict. `clang` actually appears in the middle of the version string. This change will allow perl to build correctly when `gcc` isn't present on the system. See: https://github.com/Perl/perl5/issues/21099 Signed-off-by: Raul E Rangel chromium.org> Closes: https://github.com/gentoo/gentoo/pull/32677 Signed-off-by: Sam James gentoo.org> .../perl-5.36.0-fix-configure-for-clang.patch | 41 ++++++++++++++++++++++ dev-lang/perl/perl-5.36.1-r3.ebuild | 4 +++ dev-lang/perl/perl-5.38.0-r1.ebuild | 4 +++ dev-lang/perl/perl-5.38.2-r1.ebuild | 4 +++ 4 files changed, 53 insertions(+) diff --git a/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch b/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch new file mode 100644 index 000000000000..3ad508c95f7e --- /dev/null +++ b/dev-lang/perl/files/perl-5.36.0-fix-configure-for-clang.patch @@ -0,0 +1,41 @@ +From 40db21129c0ba08ea457b6e40e7357e86ea1404b Mon Sep 17 00:00:00 2001 +From: Raul E Rangel +Date: Fri, 28 Jul 2023 15:50:49 -0600 +Subject: [PATCH] hints/linux: Add additional expression when matching clang + +Newer versions of clang actually print the distro before `clang` when +calling `$CC --version`. This changes fixes the regex so it can match +this new pattern. + +i.e., + + $ clang --version + Debian clang version 14.0.6 + + $ x86_64-pc-linux-gnu-clang --version + Chromium OS 17.0_pre496208_p20230501-r1 clang version 17.0.0 + +Fixes #21099 + +BUG=b:283275881 +See: https://github.com/Perl/perl5/issues/21099 +--- + hints/linux.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hints/linux.sh b/hints/linux.sh +index e1508c7509..5202b28b09 100644 +--- a/hints/linux.sh ++++ b/hints/linux.sh +@@ -166,7 +166,7 @@ esac + if [ -x /usr/bin/gcc ] ; then + gcc=/usr/bin/gcc + # clang also provides -print-search-dirs +-elif ${cc:-cc} --version 2>/dev/null | grep -q '^clang ' ; then ++elif ${cc:-cc} --version 2>/dev/null | grep -q -e '^clang version' -e ' clang version'; then + gcc=${cc:-cc} + else + gcc=gcc +-- +2.41.0.585.gd2178a4bd4-goog + diff --git a/dev-lang/perl/perl-5.36.1-r3.ebuild b/dev-lang/perl/perl-5.36.1-r3.ebuild index 553ab9f76a38..277079bb9ef4 100644 --- a/dev-lang/perl/perl-5.36.1-r3.ebuild +++ b/dev-lang/perl/perl-5.36.1-r3.ebuild @@ -395,6 +395,10 @@ src_prepare() { add_patch "${FILESDIR}/${PN}-5.36.1-http-tiny.patch" "0111-5.36.1-http-tiny.patch"\ "Enable certificate checking in HTTP::Tiny by default"\ "https://bugs.gentoo.org/905296" "https://bugs.debian.org/954089" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, diff --git a/dev-lang/perl/perl-5.38.0-r1.ebuild b/dev-lang/perl/perl-5.38.0-r1.ebuild index 66a37abc47a9..c518862f3ed4 100644 --- a/dev-lang/perl/perl-5.38.0-r1.ebuild +++ b/dev-lang/perl/perl-5.38.0-r1.ebuild @@ -395,6 +395,10 @@ src_prepare() { # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ # "Fix broken miniperl on hppa"\ # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, diff --git a/dev-lang/perl/perl-5.38.2-r1.ebuild b/dev-lang/perl/perl-5.38.2-r1.ebuild index 8edc3aca52ba..d0575868dfe2 100644 --- a/dev-lang/perl/perl-5.38.2-r1.ebuild +++ b/dev-lang/perl/perl-5.38.2-r1.ebuild @@ -396,6 +396,10 @@ src_prepare() { # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ # "Fix broken miniperl on hppa"\ # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + add_patch "${FILESDIR}/${PN}-5.36.0-fix-configure-for-clang.patch" \ + "100-5.36.0-fix-configure-for-clang.patch" \ + "Fix clang check in configure" \ + "https://github.com/Perl/perl5/issues/21099" if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary,