diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2023-09-07 14:52:27 -0400 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2023-09-07 14:52:27 -0400 |
| commit | 3a0a1c5bbced336389c9dd8569215daa4d9347f5 (patch) | |
| tree | a42a7215ddf5910ecc3f6fd0cc6d7f45bf18291a /dev-lang | |
| parent | mail-filter/rspamd: Stabilize 3.6-r1 amd64, #913753 (diff) | |
| download | gentoo-3a0a1c5bbced336389c9dd8569215daa4d9347f5.tar.gz gentoo-3a0a1c5bbced336389c9dd8569215daa4d9347f5.tar.bz2 gentoo-3a0a1c5bbced336389c9dd8569215daa4d9347f5.zip | |
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 <mjo@gentoo.org>
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/php/php-8.0.30.ebuild | 8 | ||||
| -rw-r--r-- | dev-lang/php/php-8.1.21.ebuild | 8 | ||||
| -rw-r--r-- | 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") |