From nobody Fri Nov 15 12:05:19 2024 X-Original-To: dev-commits-ports-branches@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 4XqbLm0bLKz5d3ln; Fri, 15 Nov 2024 12:05:20 +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 4XqbLl6v5wz4hTS; Fri, 15 Nov 2024 12:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731672320; 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=ocZ3xbFIcSNJhRYG9sD8FDXR1meI/iu5KXv2CfsDWIc=; b=ncYBEZ2SdFxPZflRVsn24cYZB7ybn3N5sebdm6Y8iVyZqzdL9JOiT7sffpHNblTiMFKM4W bLI2SiE1sGCDzY1oHjnYUa8XktppD+62eQUsCnNZOZsM22S2GAImD7dYRAGjgE+zXZbkbw gU1z02yCyrxzUDF8ziiRcOJgDMyi+y29F8d/wro2KWuE8n/Rh5Ib9JjM0bTYL3uIS1KFTb 6x37uj53hkJyxY5mMqUSBpKcy404VYX0Q5ne+JFidhmswV61DSNXp8ondPI3+ANCvfCeOG BRjSFcYPY+TniuPoL/C1h6XZ/erCM20yBauu6KiMiPiOyc9ztswEr8UEmA5EtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731672320; 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=ocZ3xbFIcSNJhRYG9sD8FDXR1meI/iu5KXv2CfsDWIc=; b=sqHeBCOAA6NoNC30MnSaM0MlsGwV77cFsq/h5fnifrfkl1tLt/L1NezLImf6HowExRPvVr uMsjSlBqiSCTsPiPzTD2mv4bIwvnxp3QqHosZha5DLAi+r6aNqYP83XQN4Uk6sKDa6Km3B k7b9DofdXzhLp8iG2/9YgyJbvDTZo61QSvL9L4r4V6SEbOsMwhGnlcv85+eqDHKAR9f9CB 4LXBJhjXiVGniVevski4gV1e6OfcCHtI/fuFuKTnnEWWaB+ShyMHojJBiqNEApmxdAKGOr paPRN8+uo/8OdvOfwpHFheLnMcL5EhxmjUB091upKGohR34wdil8MxMK6pTnxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731672320; a=rsa-sha256; cv=none; b=yqh5ee0Wj9nAoIT6B2qzlvKd9PThRQY08QHT46f/1OyWAQTpPHVIvfE4tcethqIivRWoJF aI73n/PsDCNyUpiecTbohER1dyZKPEREep1D6vhhtXON5NitAuRwbaIoQImSM/PwxRqv1O Qw4ioQuWp//3sV/aflUF4Uhtnc5R8rUkNkLqaYOCADa+gLG+PhpYIs+5yZk+LmoVgCpMTp yfUYk7tbf9eI1IPxC6b65iByRKYAQ45BZOw3DAn0/9fgb+o2iZCDyKRYMN/FHckcbcZUUg LfjqaHuZXji+t+c8kNXmlMD0bookGrvCIAM9R2lwQpdk+g8syv0Pzw+KHg20fQ== 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 4XqbLl6Vc3zLpq; Fri, 15 Nov 2024 12:05:19 +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 4AFC5Jqi066291; Fri, 15 Nov 2024 12:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFC5Jt8066288; Fri, 15 Nov 2024 12:05:19 GMT (envelope-from git) Date: Fri, 15 Nov 2024 12:05:19 GMT Message-Id: <202411151205.4AFC5Jt8066288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9635e50da80b - 2024Q4 - devel/pecl-vld: Fix build with PHP 8.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 9635e50da80b2d8a88349a6084e87de92284189f Auto-Submitted: auto-generated The branch 2024Q4 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9635e50da80b2d8a88349a6084e87de92284189f commit 9635e50da80b2d8a88349a6084e87de92284189f Author: Po-Chuan Hsieh AuthorDate: 2024-11-15 10:09:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-11-15 12:05:12 +0000 devel/pecl-vld: Fix build with PHP 8.1 /bin/sh /wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/libtool --mode=compile cc -I. -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0 -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/include -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/main -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0 -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -DHAVE_CONFIG_H -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DZEND_COMPILE_DL_EXT=1 -c /wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/srm_oparray.c -o srm_oparray.lo -MMD -MF srm_oparray.dep -MT srm_oparray.lo cc -I. -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0 -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/include -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/main -I/wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0 -I/usr/local/include/php -I/usr/local/include/php/main -I/usr/local/include/php/TSRM -I/usr/local/include/php/Zend -I/usr/local/include/php/ext -I/usr/local/include/php/ext/date/lib -DHAVE_CONFIG_H -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DZEND_COMPILE_DL_EXT=1 -c /wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/srm_oparray.c -MMD -MF srm_oparray.dep -MT srm_oparray.lo -fPIC -DPIC -o .libs/srm_oparray.o /wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/srm_oparray.c:1132:7: error: member reference base type 'void' is not a structure or union 1132 | if (zend_string_equals_literal(Z_PTR_P(func_name), "exit")) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/php/Zend/zend_string.h:372:3: note: expanded from macro 'zend_string_equals_literal' 372 | (ZSTR_LEN(str) == sizeof(literal)-1 && !memcmp(ZSTR_VAL(str), literal, sizeof(literal) - 1)) | ^~~~~~~~~~~~~ /usr/local/include/php/Zend/zend_string.h:67:31: note: expanded from macro 'ZSTR_LEN' 67 | #define ZSTR_LEN(zstr) (zstr)->len | ~~~~~~^ ~~~ /wrkdirs/usr/ports/devel/pecl-vld/work-php81/vld-0.18.0/srm_oparray.c:1132:7: error: member reference base type 'void' is not a structure or union 1132 | if (zend_string_equals_literal(Z_PTR_P(func_name), "exit")) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/local/include/php/Zend/zend_string.h:372:49: note: expanded from macro 'zend_string_equals_literal' 372 | (ZSTR_LEN(str) == sizeof(literal)-1 && !memcmp(ZSTR_VAL(str), literal, sizeof(literal) - 1)) | ^~~~~~~~~~~~~ /usr/local/include/php/Zend/zend_string.h:66:31: note: expanded from macro 'ZSTR_VAL' 66 | #define ZSTR_VAL(zstr) (zstr)->val | ~~~~~~^ ~~~ 2 errors generated. Reference: https://pkg-status.freebsd.org/beefy18/data/main-amd64-default/pea7acb655568_s65a4daeaf32/logs/php81-pecl-vld-0.18.0.log https://pkg-status.freebsd.org/beefy22/data/141amd64-default/dfee61567d9e/logs/php81-pecl-vld-0.18.0.log https://pkg-status.freebsd.org/beefy16/data/133amd64-default/ea7acb655568/logs/php81-pecl-vld-0.18.0.log (cherry picked from commit a40cc64580d732608c8f98931b6866b2430ea071) --- devel/pecl-vld/files/patch-php84 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/devel/pecl-vld/files/patch-php84 b/devel/pecl-vld/files/patch-php84 index 13d955a790ba..96c47096e8c6 100644 --- a/devel/pecl-vld/files/patch-php84 +++ b/devel/pecl-vld/files/patch-php84 @@ -65,10 +65,11 @@ Obtained from: https://github.com/derickr/vld/commit/df1c52c4cb62e5ff31e1b72e3f1 opcode.opcode == ZEND_THROW || #if PHP_VERSION_ID >= 80000 opcode.opcode == ZEND_MATCH_ERROR || -@@ -1094,6 +1125,48 @@ int vld_find_jumps(zend_op_array *opa, unsigned int po +@@ -1094,6 +1125,49 @@ int vld_find_jumps(zend_op_array *opa, unsigned int po jumps[0] = VLD_JMP_EXIT; *jump_count = 1; return 1; ++#if PHP_VERSION_ID >= 80200 + } else if ( + opcode.opcode == ZEND_INIT_FCALL + ) { @@ -110,11 +111,11 @@ Obtained from: https://github.com/derickr/vld/commit/df1c52c4cb62e5ff31e1b72e3f1 + *jump_count = 1; + return 1; + } -+ ++# endif #if PHP_VERSION_ID >= 70200 } else if ( # if PHP_VERSION_ID >= 80000 -@@ -1233,6 +1306,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i +@@ -1233,6 +1307,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i break; } @@ -122,7 +123,7 @@ Obtained from: https://github.com/derickr/vld/commit/df1c52c4cb62e5ff31e1b72e3f1 /* See if we have an exit instruction */ if (opa->opcodes[position].opcode == ZEND_EXIT) { VLD_PRINT(1, "Exit found\n"); -@@ -1240,6 +1314,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i +@@ -1240,6 +1315,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i branch_info->branches[position].start_lineno = opa->opcodes[position].lineno; break; }