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 B908B158089 for ; Thu, 7 Sep 2023 18:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC3812BC042; Thu, 7 Sep 2023 18:58:39 +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 CE1AD2BC042 for ; Thu, 7 Sep 2023 18:58:39 +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 7B5A9335C60 for ; Thu, 7 Sep 2023 18:58:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C66B61104 for ; Thu, 7 Sep 2023 18:58:36 +0000 (UTC) From: "Michael Orlitzky" 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" Message-ID: <1694112747.3a0a1c5bbced336389c9dd8569215daa4d9347f5.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.0.30.ebuild dev-lang/php/php-8.1.21.ebuild dev-lang/php/php-8.2.9.ebuild X-VCS-Directories: dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 3a0a1c5bbced336389c9dd8569215daa4d9347f5 X-VCS-Branch: master Date: Thu, 7 Sep 2023 18:58:36 +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: d339c150-2739-431c-baa7-eabad4613bd6 X-Archives-Hash: 473a140167dd128f796db95bedb19bf7 commit: 3a0a1c5bbced336389c9dd8569215daa4d9347f5 Author: Michael Orlitzky gentoo org> AuthorDate: Thu Sep 7 18:52:27 2023 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Thu Sep 7 18:52:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a0a1c5b dev-lang/php: filter LTO flags This is a better fix for bug 866683 (and now 913527). Closes: https://bugs.gentoo.org/913527 Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/php/php-8.0.30.ebuild | 8 +++----- dev-lang/php/php-8.1.21.ebuild | 8 +++----- dev-lang/php/php-8.2.9.ebuild | 8 +++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/dev-lang/php/php-8.0.30.ebuild b/dev-lang/php/php-8.0.30.ebuild index e6186d2f2624..a03e55d60986 100644 --- a/dev-lang/php/php-8.0.30.ebuild +++ b/dev-lang/php/php-8.0.30.ebuild @@ -241,6 +241,9 @@ src_configure() { PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 + filter-lto + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. local our_conf=( @@ -255,11 +258,6 @@ src_configure() { $(use_enable threads zts) ) - if is-flagq -flto; then - # https://bugs.gentoo.org/866683 - our_conf+=( --disable-gcc-global-regs ) - fi - our_conf+=( $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") diff --git a/dev-lang/php/php-8.1.21.ebuild b/dev-lang/php/php-8.1.21.ebuild index db53ccbaa5bb..1e3a6c509724 100644 --- a/dev-lang/php/php-8.1.21.ebuild +++ b/dev-lang/php/php-8.1.21.ebuild @@ -245,6 +245,9 @@ src_configure() { PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 + filter-lto + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. local our_conf=( @@ -259,11 +262,6 @@ src_configure() { $(use_enable threads zts) ) - if is-flagq -flto; then - # https://bugs.gentoo.org/866683 - our_conf+=( --disable-gcc-global-regs ) - fi - our_conf+=( $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") diff --git a/dev-lang/php/php-8.2.9.ebuild b/dev-lang/php/php-8.2.9.ebuild index e725e7b5c992..b705912b84b2 100644 --- a/dev-lang/php/php-8.2.9.ebuild +++ b/dev-lang/php/php-8.2.9.ebuild @@ -311,6 +311,9 @@ src_configure() { addpredict /usr/share/snmp/mibs/.index #nowarn addpredict /var/lib/net-snmp/mib_indexes #nowarn + # https://bugs.gentoo.org/866683, https://bugs.gentoo.org/913527 + filter-lto + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" # Don't allow ./configure to detect and use an existing version @@ -333,11 +336,6 @@ src_configure() { $(use_enable threads zts) ) - if is-flagq -flto; then - # https://bugs.gentoo.org/866683 - our_conf+=( --disable-gcc-global-regs ) - fi - our_conf+=( $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr")