From nobody Sat Sep 23 11:15:21 2023 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 4Rt64T4lxLz4tV1x; Sat, 23 Sep 2023 11:15:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rt64T4G80z3HVS; Sat, 23 Sep 2023 11:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695467721; 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=JbCdFL0mIIu89xru1pRB1gJITeK0NjYDwF7vTs4ruT4=; b=uPoHwF3lrKnZYUnIT8bwW7+CpMuYI6K6U12EO+MucZPetd6MrZIIKIMvSqKjaI3I0Y9vWX kt5wDzI5vLhCjteLKeFdUC0m9NdKQyzQQ3iX1gHNCYS8Cd8NvjfydxPBJkyX5LVveN88KG Rrmw4vl/7d1yFnCtxYrIOTMja+enHfI/hJv+f7oRtit7AsNGbGuXP7KTNi3ihR32yHpgfm 27qs/xT58Bqvwmi/6OCghCqJkFvTtV6aQPbvB3QU/zM8+bPX21/Yj3bBZBMXmzQ7BtHWhY o/sYNIePo4c8mpRIQt+P/mzYhQs6N4lFXkQgSzQSoh9qY3JLgYto6Tl/6tZrXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695467721; a=rsa-sha256; cv=none; b=tMcVCtX5rfpk+O3p+z9CClM5JqC5WQeGEl63SzenBID0eDPulJjh9AHzySsMvUOBpV4dkS DFiIr0Y7KvxB6+2xeWcexznZ1uihDRQQZlGhAtmqdBkd5jbVak26QwEnMz+7mYTIgaCJdV c8xh1rvmGwtiLO9sjvZhFFQfywNu+/ioOg7Iz7c9WcgTtrIJl4e4YS3OLoGBmrC/dZ0+2B iJ0tfyoUhdt4lzL3ltKn6dBr0gVi/EeAHUZwkowwYJOk74fhhlu+1GJSb9pJoxgxtgSLmw cRjWbh+ZypZIgTXb1zgCR3y82qwS/6MSbu/HHXd5d6VAhVnFIC4eMD5l6WjHfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695467721; 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=JbCdFL0mIIu89xru1pRB1gJITeK0NjYDwF7vTs4ruT4=; b=ul4uXqqAxYH3qI0GQp2VrMxBkLQ6VN8jz2+Yk5J4xXJIR1WYxx1C998gdaWKfGRHiZXkBo vgx764HGXNJS5Pbzmteirxa5AeqpyCHUFQPjZd3haxh/ibI6mQQXoR2f+w1eh5d9fUCnuA z3/xQdvMze0Vsz4iUsnB0H7ULtHdrgDmTvJI/k2W8CbznfUcyvRodebiqY00zaP5lSHA23 SmGgF9fN2quJws0sFKURaKY9SFwkGuaEcl/p0imQ24lOpo8yCzQqHR96AiesxTMD0igjA8 6hcLtDzjm4Ri+Zfrh4K0TKBAmtKDKoTFlKAvUqaWK02x3OaICZ5BH2UqkySMDw== 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 4Rt64T3K2Yz122T; Sat, 23 Sep 2023 11:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NBFLlH089284; Sat, 23 Sep 2023 11:15:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NBFLOw089281; Sat, 23 Sep 2023 11:15:21 GMT (envelope-from git) Date: Sat, 23 Sep 2023 11:15:21 GMT Message-Id: <202309231115.38NBFLOw089281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 13b9ae915767 - main - lang/php83: Reintroduce ifunc support 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13b9ae91576775f52d9ea7ebc026b690f0a743ca Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=13b9ae91576775f52d9ea7ebc026b690f0a743ca commit 13b9ae91576775f52d9ea7ebc026b690f0a743ca Author: Thomas Hurst AuthorDate: 2023-09-23 11:11:12 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-09-23 11:15:05 +0000 lang/php83: Reintroduce ifunc support SIMD functions were disabled prior to 12 and it was never chased upstream. However now it supports ifunc or it has improved. So let's test and see how well it works. There is an upstream PR: https://github.com/php/php-src/pull/12274 PR: 274011 --- lang/php83/Makefile | 1 + lang/php83/files/patch-build_php.m4 | 11 +++++++++++ lang/php83/files/patch-configure.ac | 19 ++++++++++++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/lang/php83/Makefile b/lang/php83/Makefile index cbd4a425afe6..f480bb4cd77b 100644 --- a/lang/php83/Makefile +++ b/lang/php83/Makefile @@ -1,5 +1,6 @@ PORTNAME= php83 DISTVERSION= 8.3.0RC2 +PORTREVISION= 1 CATEGORIES?= lang devel www MASTER_SITES= https://downloads.php.net/~jakub/ \ https://downloads.php.net/~eric/ diff --git a/lang/php83/files/patch-build_php.m4 b/lang/php83/files/patch-build_php.m4 new file mode 100644 index 000000000000..92aac1365db6 --- /dev/null +++ b/lang/php83/files/patch-build_php.m4 @@ -0,0 +1,11 @@ +--- build/php.m4.orig 2023-09-23 00:45:39 UTC ++++ build/php.m4 +@@ -2713,7 +2713,7 @@ AC_DEFUN([PHP_CHECK_BUILTIN_CPU_INIT], [ + AC_MSG_CHECKING([for __builtin_cpu_init]) + + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ +- return __builtin_cpu_init()? 1 : 0; ++ __builtin_cpu_init(); + ]])], [ + have_builtin_cpu_init=1 + AC_MSG_RESULT([yes]) diff --git a/lang/php83/files/patch-configure.ac b/lang/php83/files/patch-configure.ac index e81f933fbdfb..d2468ec18e55 100644 --- a/lang/php83/files/patch-configure.ac +++ b/lang/php83/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2023-06-06 15:54:29 UTC +--- configure.ac.orig 2023-09-12 11:29:39 UTC +++ configure.ac @@ -55,6 +55,7 @@ AH_BOTTOM([ @@ -8,7 +8,7 @@ #endif /* PHP_CONFIG_H */ ]) -@@ -281,7 +282,6 @@ sinclude(Zend/Zend.m4) +@@ -283,7 +284,6 @@ sinclude(Zend/Zend.m4) dnl ---------------------------------------------------------------------------- @@ -16,7 +16,16 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -652,7 +652,7 @@ strerror_r \ +@@ -567,7 +567,7 @@ dnl Fix for these systems is already included in GCC 7 + dnl + dnl At least some versions of FreeBSD seem to have buggy ifunc support, see + dnl bug #77284. Conservatively don't use ifuncs on FreeBSD. +-AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*freebsd*|*openbsd*], [true], [ ++AS_CASE([$host_alias], [*-*-*android*|*-*-*uclibc*|*-*-*musl*|*openbsd*], [true], [ + AX_GCC_FUNC_ATTRIBUTE([ifunc]) + AX_GCC_FUNC_ATTRIBUTE([target]) + ]) +@@ -652,7 +652,7 @@ AC_FUNC_STRERROR_R AX_FUNC_WHICH_GETHOSTBYNAME_R dnl Some systems (like OpenSolaris) do not have nanosleep in libc. @@ -25,7 +34,7 @@ dnl Haiku does not have network api in libc. PHP_CHECK_FUNC_LIB(setsockopt, network) -@@ -1464,7 +1464,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` +@@ -1463,7 +1463,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfdir` EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` @@ -34,7 +43,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1689,7 +1689,7 @@ PHP_SUBST(all_targets) +@@ -1688,7 +1688,7 @@ PHP_SUBST(all_targets) PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets)