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 522E3158041 for ; Mon, 11 Mar 2024 10:25:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8CB94E2A5E; Mon, 11 Mar 2024 10:25:07 +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 69275E2A5E for ; Mon, 11 Mar 2024 10:25:07 +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 6237C340C42 for ; Mon, 11 Mar 2024 10:25:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF87E13C3 for ; Mon, 11 Mar 2024 10:25:04 +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: <1710152640.9eecf694c25c09ddcf2b713bc0960172e5922ada.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.3.3-r1.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: 9eecf694c25c09ddcf2b713bc0960172e5922ada X-VCS-Branch: master Date: Mon, 11 Mar 2024 10:25:04 +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: 2bc65bc5-8e79-4cdd-99e8-2fa60bb2547a X-Archives-Hash: 8f41fb135a04b9d3be2d91b008cd8479 commit: 9eecf694c25c09ddcf2b713bc0960172e5922ada Author: Michael Orlitzky gentoo org> AuthorDate: Mon Mar 11 01:53:15 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Mon Mar 11 10:24:00 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eecf694 dev-lang/php: simplify opcache installation We don't need to specify the opcache path explicitly (or hack the ini files) if we use the upstream "make install-modules" target that installs opcache to the expected default path. Signed-off-by: Michael Orlitzky gentoo.org> .../php/{php-8.3.3.ebuild => php-8.3.3-r1.ebuild} | 25 ++++++---------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dev-lang/php/php-8.3.3.ebuild b/dev-lang/php/php-8.3.3-r1.ebuild similarity index 97% rename from dev-lang/php/php-8.3.3.ebuild rename to dev-lang/php/php-8.3.3-r1.ebuild index 488c1dbec923..8fe4000652a6 100644 --- a/dev-lang/php/php-8.3.3.ebuild +++ b/dev-lang/php/php-8.3.3-r1.ebuild @@ -174,10 +174,6 @@ php_install_ini() { local phpinisrc="php.ini-production-${phpsapi}" cp php.ini-production "${phpinisrc}" || die - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \ - -i "${phpinisrc}" || die - # Set the include path to point to where we want to find PEAR # packages local sed_src='^;include_path = ".:/php.*' @@ -198,7 +194,7 @@ php_install_ini() { if use opcache; then elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + echo "zend_extension = opcache.so" >> \ "${D}/${PHP_EXT_INI_DIR}"/opcache.ini dosym "../ext/opcache.ini" \ "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" @@ -508,6 +504,10 @@ src_configure() { # in main/build-defs.h which is included in main/php.h which is # included by basically everything; so, avoiding a rebuild after # changing it is not an easy job. + # + # The upstream build system also does not support building the + # apache2 and embed SAPIs at the same time, presumably because they + # both produce a libphp.so. local one_sapi local sapi mkdir "${WORKDIR}/sapis-build" || die @@ -599,20 +599,15 @@ src_install() { fi done - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) + # Install SAPI-independent targets cd "${WORKDIR}/sapis-build/$first_sapi" || die emake INSTALL_ROOT="${D}" \ install-build install-headers install-programs - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + use opcache && emake INSTALL_ROOT="${D}" install-modules # Create the directory where we'll put version-specific php scripts keepdir "/usr/share/php${PHP_MV}" - local file="" local sapi_list="" for sapi in ${SAPIS}; do @@ -678,12 +673,6 @@ src_install() { fi done - # Installing opcache module - if use opcache ; then - into "${PHP_DESTDIR#${EPREFIX}}" - dolib.so "modules/opcache$(get_libname)" - fi - # Install env.d files newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die