From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1602888-garchives=archives.gentoo.org@lists.gentoo.org>
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) server-digest SHA256)
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2F570158041
	for <garchives@archives.gentoo.org>; Thu, 22 Feb 2024 20:19:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 52A982BC02D;
	Thu, 22 Feb 2024 20:19:41 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 2F0182BC02D
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2024 20:19:41 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 222FF34321A
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2024 20:19:40 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id A4E33114F
	for <gentoo-commits@lists.gentoo.org>; Thu, 22 Feb 2024 20:19:38 +0000 (UTC)
From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" <mjo@gentoo.org>
Message-ID: <1708633096.5e22a3e7f0ceb1f050498bde29d3d2885a47c51e.mjo@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/php/php-8.2.16.ebuild dev-lang/php/php-8.3.3.ebuild
X-VCS-Directories: dev-lang/php/
X-VCS-Committer: mjo
X-VCS-Committer-Name: Michael Orlitzky
X-VCS-Revision: 5e22a3e7f0ceb1f050498bde29d3d2885a47c51e
X-VCS-Branch: master
Date: Thu, 22 Feb 2024 20:19:38 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6c6c452c-df45-4bea-b578-e78eb4b2a920
X-Archives-Hash: 4ad47f9c3f71734936a80b6a66a4897a

commit:     5e22a3e7f0ceb1f050498bde29d3d2885a47c51e
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 20:15:24 2024 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 20:18:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e22a3e7

dev-lang/php: whitelist more implicitly defined functions in ./configure

Closes: https://bugs.gentoo.org/925268
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 dev-lang/php/php-8.2.16.ebuild | 8 +++++++-
 dev-lang/php/php-8.3.3.ebuild  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-lang/php/php-8.2.16.ebuild b/dev-lang/php/php-8.2.16.ebuild
index b577e38682dd..78da01537337 100644
--- a/dev-lang/php/php-8.2.16.ebuild
+++ b/dev-lang/php/php-8.2.16.ebuild
@@ -152,13 +152,19 @@ PATCHES=(
 	"${FILESDIR}/php-8.2.8-openssl-tests.patch"
 )
 
-# ARM/Windows functions that are expected to be undefined.
+# ARM/Windows functions (bug 923335)
 QA_CONFIG_IMPL_DECL_SKIP=(
 	__crc32d
 	_controlfp
 	_controlfp_s
 )
 
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	iconv_ccs_init
+	cstoccsid
+)
+
 php_install_ini() {
 	local phpsapi="${1}"
 

diff --git a/dev-lang/php/php-8.3.3.ebuild b/dev-lang/php/php-8.3.3.ebuild
index c914d8167246..488c1dbec923 100644
--- a/dev-lang/php/php-8.3.3.ebuild
+++ b/dev-lang/php/php-8.3.3.ebuild
@@ -151,13 +151,19 @@ PATCHES=(
 	"${FILESDIR}/php-iodbc-header-location.patch"
 )
 
-# ARM/Windows functions that are expected to be undefined.
+# ARM/Windows functions (bug 923335)
 QA_CONFIG_IMPL_DECL_SKIP=(
 	__crc32d
 	_controlfp
 	_controlfp_s
 )
 
+# Functions from alternate iconv implementations (bug 925268)
+QA_CONFIG_IMPL_DECL_SKIP+=(
+	iconv_ccs_init
+	cstoccsid
+)
+
 php_install_ini() {
 	local phpsapi="${1}"