From nobody Wed Dec 11 17:34:05 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7jQ61ys2z5gDDG; Wed, 11 Dec 2024 17:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7jQ60hjLz4J2k; Wed, 11 Dec 2024 17:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733938446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqsAIYiBg9Lufs9cLUA3bCZhTVPlEwOHEcrgIe3IQUc=; b=L7IJ4aLUz4h3ig+S8MZgYRRnDqYZkxT10aipFQ+F9wqUwHsOBgene3CVAjD5YoUfisETxu UCnuZm18JNVWN4fmJf0xpCSloi8mnrTfFBl9GUXwvxCl2WjH1NENJxpdRVWkHxbIHVFAAI 1mlWlojG6AElPoxjxj/8C/qE+2DCJsawZIlTX9FyBOZEpuLLZUfU9dgbBl7zp3n6e6RfEV pHeEqFDILfvsXTGOnMg9OeAMKrVKm2jIXo71czYOgCLRqGeMvWq53e7EaiiZue9FC30MLk 5ltODeOmjNtSooq/bMsl4oum1KTPOX6EzZSYBdvA0Hi/X0OyBa12uKCqvpGu1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733938446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqsAIYiBg9Lufs9cLUA3bCZhTVPlEwOHEcrgIe3IQUc=; b=hxrDmdU4o3roeC/txGmDsWaFlBC+8EU6LGKVmz+ZYm2HxujMuGwbH4zvMAofYxTzVdkIpm 3uMNRJuPNIOymLFvno1TqxYe3JQyBuxRFhnpqWk7PKFT08PPosFVmpLAuiDMFIWBOjdW1d ezEjzyDCYe7MQrtcTkInrFw15FicchVRSrEISM9O3Isofn/Rih7I7bq6nIGSZtt5N8kcJN ro7noBtJvE2PL3rBNQ77KcscgOXZseza1CXy9vlLK5CXBS1cjKe3KtMchNARg8T6eCbiDa oHkNFSTTkFx7a5vnChcmZGTTkaGFHtgerhyZpZhg7OLDW25XGZ3eeu0gZA+RwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733938446; a=rsa-sha256; cv=none; b=r3YyArhYTcCpGEYo0Vvbuu9Toy77xTW4PSmjG1IUyVI7haLzxpN+MuHjWgSnPJbbw632q+ A6M7eF93ZB9wQHb0fAjAGy/BytDQHweCVStAk+E2Ea98Omkl+Y7QAOFeSQloFel5BBKSBM QZk/d1UcNvnALTANtxawntjFscNDSTohvEcd5iPTxI/mbSFC9Qr+Vc5HioahReb+Ek8DcI 5+A8bgVfYff10sW+fOuE5uBkRsD7Wr4bRgtEC4YRwtoo3Qj40WIkKdBgQoY+zTdJavpgu2 jYZ7h1YRNP994WLuhUAKa/Ygq5kSYLAdq0KywSmq+yzZRKNnMyNYYiNldSJ8gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7jQ603V6zHPc; Wed, 11 Dec 2024 17:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BBHY551028943; Wed, 11 Dec 2024 17:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBHY5GX028940; Wed, 11 Dec 2024 17:34:05 GMT (envelope-from git) Date: Wed, 11 Dec 2024 17:34:05 GMT Message-Id: <202412111734.4BBHY5GX028940@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 9df694a48dce - main - www/php84-opcache: fix build on non-amd64 / non-i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df694a48dced4125478aff98b3af12410c8bc6b Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9df694a48dced4125478aff98b3af12410c8bc6b commit 9df694a48dced4125478aff98b3af12410c8bc6b Author: Piotr Kubaj AuthorDate: 2024-12-09 15:32:03 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-11 17:28:56 +0000 www/php84-opcache: fix build on non-amd64 / non-i386 post-configure step unconditionally tried to use JIT source, even when JIT was disabled in ports (on aarch64) or in the source (powerpc*, riscv*, armv7), which caused build breakage. This commit checks whether JIT is supported (currently it is only on aarch64, amd64 and i386) and only then uses JIT sources. It also enables JIT on aarch64, which was disabled previously. --- lang/php84/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lang/php84/Makefile b/lang/php84/Makefile index f79e3b788e71..904cee35a0f5 100644 --- a/lang/php84/Makefile +++ b/lang/php84/Makefile @@ -590,11 +590,7 @@ USES+= pkgconfig .include -.if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache" -CONFIGURE_ARGS+=--disable-opcache-jit -.endif - -.if ${PHP_MODNAME} == "opcache" +.if (${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386) && ${PHP_MODNAME} == "opcache" post-configure: @${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_fold_hash.h @${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_emit.lo