CVS commit: pkgsrc/lang/php56

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Aug 29 02:43:38 UTC 2026

Modified Files:
        pkgsrc/lang/php56: Makefile distinfo
Added Files:
        pkgsrc/lang/php56/patches: patch-Zend_zend__multiply.h

Log Message:
(lang/php56) fix build for aarch64, by importing php85 change. Not fully checked sorry


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/lang/php56/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/lang/php56/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php56/patches/patch-Zend_zend__multiply.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php56/Makefile
diff -u pkgsrc/lang/php56/Makefile:1.48 pkgsrc/lang/php56/Makefile:1.49
--- pkgsrc/lang/php56/Makefile:1.48     Thu Mar 19 17:49:26 2026
+++ pkgsrc/lang/php56/Makefile  Sat Aug 29 02:43:37 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.48 2026/03/19 17:49:26 jperkin Exp $
+# $NetBSD: Makefile,v 1.49 2026/08/29 02:43:37 mef Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               ${PHP_PKG_PREFIX}-${PHP_VERSION}
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            lang
 
 COMMENT=               PHP Hypertext Preprocessor version 5.6

Index: pkgsrc/lang/php56/distinfo
diff -u pkgsrc/lang/php56/distinfo:1.66 pkgsrc/lang/php56/distinfo:1.67
--- pkgsrc/lang/php56/distinfo:1.66     Wed Jul  9 10:22:20 2025
+++ pkgsrc/lang/php56/distinfo  Sat Aug 29 02:43:37 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2025/07/09 10:22:20 jperkin Exp $
+$NetBSD: distinfo,v 1.67 2026/08/29 02:43:37 mef Exp $
 
 BLAKE2s (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = 9eaf6505d80e90147fd0b993fb501620030eea24ccd69e42c49d8faf50d47775
 SHA512 (PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch) = bbe39ad27a5a82c705692c921b214c5630227ed9852f0432340f74533b5e618d9bea01bff75a4b7a1f1b72876b6d092d2db4533758d9a927f274cff7361f3eb4
@@ -8,6 +8,7 @@ SHA512 (php-5.6.40.tar.xz) = 997b5a952a6
 Size (php-5.6.40.tar.xz) = 12472236 bytes
 SHA1 (patch-Makefile.global) = cf4dec0e4adf4ceceffb498919c1b463db9c6e66
 SHA1 (patch-TSRM_threads.m4) = 83c51ef32371598689f2610726a2902e503b1d55
+SHA1 (patch-Zend_zend__multiply.h) = b51442f44e5b5853162a1ac7e451359d292b8210
 SHA1 (patch-acinclude.m4) = 46ee41b151927673b0d17fbd13a3159b2f7aab0a
 SHA1 (patch-aclocal.m4) = f24f25d8da5d846902ba94ec59fe4838bd24dda1
 SHA1 (patch-configure.in) = 67ed9f97785ba4bf3f6405d4af07fc32b972ba4e

Added files:

Index: pkgsrc/lang/php56/patches/patch-Zend_zend__multiply.h
diff -u /dev/null pkgsrc/lang/php56/patches/patch-Zend_zend__multiply.h:1.1
--- /dev/null   Sat Aug 29 02:43:38 2026
+++ pkgsrc/lang/php56/patches/patch-Zend_zend__multiply.h       Sat Aug 29 02:43:37 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-Zend_zend__multiply.h,v 1.1 2026/08/29 02:43:37 mef Exp $
+
+https://mail-index.netbsd.org/pkgsrc-users/2026/08/28/msg043351.html
+Quick hack by importing from php85 
+
+--- Zend/zend_multiply.h.orig  2019-01-09 18:54:13.000000000 +0900
++++ Zend/zend_multiply.h       2026-08-29 09:48:42.223797552 +0900
+@@ -56,14 +56,17 @@
+ } while (0)
+ 
+ #elif defined(__aarch64__) && defined(__GNUC__)
++
++typedef int64_t zend_long;
++
+ 
+ #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {     \
+-      long __tmpvar;                                                                                                  \
++      zend_long __tmpvar;                                                                                                     \
+       __asm__("mul %0, %2, %3\n"                                                                              \
+               "smulh %1, %2, %3\n"                                                                            \
+               "sub %1, %1, %0, asr #63\n"                                                                     \
+-                      : "=X"(__tmpvar), "=X"(usedval)                                                 \
+-                      : "X"(a), "X"(b));                                                                              \
++                       : "=&r"(__tmpvar), "=&r"(usedval)                      \
++                       : "r"(a), "r"(b));                                     \
+       if (usedval) (dval) = (double) (a) * (double) (b);                              \
+       else (lval) = __tmpvar;                                                                                 \
+ } while (0)