CVS commit: pkgsrc/lang/php83

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Sun Nov 10 22:09:50 UTC 2024

Modified Files:
        pkgsrc/lang/php83: Makefile distinfo
Added Files:
        pkgsrc/lang/php83/patches: patch-TSRM_TSRM.c patch-TSRM_TSRM.h
            patch-ext_opcache_jit_zend__jit__x86.dasc

Log Message:
php83

Backport of

https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28

to fix

Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
No space available for static Thread Local Storage

PR pkg/56717


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/php83/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/php83/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/php83/patches/patch-TSRM_TSRM.c \
    pkgsrc/lang/php83/patches/patch-TSRM_TSRM.h \
    pkgsrc/lang/php83/patches/patch-ext_opcache_jit_zend__jit__x86.dasc

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

Modified files:

Index: pkgsrc/lang/php83/Makefile
diff -u pkgsrc/lang/php83/Makefile:1.7 pkgsrc/lang/php83/Makefile:1.8
--- pkgsrc/lang/php83/Makefile:1.7      Fri Nov  1 12:53:15 2024
+++ pkgsrc/lang/php83/Makefile  Sun Nov 10 22:09:50 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2024/11/01 12:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/11/10 22:09:50 prlw1 Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           2
+PKGREVISION=           3
 
 COMMENT=               PHP Hypertext Preprocessor version 8.3
 LICENSE=               php

Index: pkgsrc/lang/php83/distinfo
diff -u pkgsrc/lang/php83/distinfo:1.13 pkgsrc/lang/php83/distinfo:1.14
--- pkgsrc/lang/php83/distinfo:1.13     Thu Oct 24 13:52:06 2024
+++ pkgsrc/lang/php83/distinfo  Sun Nov 10 22:09:50 2024
@@ -1,10 +1,13 @@
-$NetBSD: distinfo,v 1.13 2024/10/24 13:52:06 taca Exp $
+$NetBSD: distinfo,v 1.14 2024/11/10 22:09:50 prlw1 Exp $
 
 BLAKE2s (php-8.3.13.tar.xz) = bd76f27687418dc834d2c31f92b2592c190689e78896ec556cfaec76cfa3a934
 SHA512 (php-8.3.13.tar.xz) = e910671375e18dcd90822b4d16bda9b878271b78dc83ef4b7834c0ddf042c82d72cd501c12aaa4550ee530ff3a315d0f468dcf3858db0814d5366048dfdbca65
 Size (php-8.3.13.tar.xz) = 12484032 bytes
+SHA1 (patch-TSRM_TSRM.c) = 278007810b74fa7a9cd971dac051d6a2ea0ad90d
+SHA1 (patch-TSRM_TSRM.h) = 70ebc03a611124d76d6813f619ff18b3a8fbf1e8
 SHA1 (patch-build_php.m4) = c85864ae22556c0a5f14b323d2cf031523625e9b
 SHA1 (patch-ext_enchant_enchant.c) = 7d999de1b2fde2ea11e4a6e16e7b59c085924b9b
+SHA1 (patch-ext_opcache_jit_zend__jit__x86.dasc) = 4d0d368aa1fb8ec076b392b6b64d2cf5d742133a
 SHA1 (patch-ext_phar_Makefile.frag) = 53ea5c58b0bc27d236118d5750a74b1cba43e5dd
 SHA1 (patch-ext_standard_php__fopen__wrapper.c) = 0a2c19c18f089448a8d842e99738b292ab9e5640
 SHA1 (patch-ext_tidy_config.m4) = 380f4e8927582b2781faf58b17ad81b6dc967ba7

Added files:

Index: pkgsrc/lang/php83/patches/patch-TSRM_TSRM.c
diff -u /dev/null pkgsrc/lang/php83/patches/patch-TSRM_TSRM.c:1.1
--- /dev/null   Sun Nov 10 22:09:50 2024
+++ pkgsrc/lang/php83/patches/patch-TSRM_TSRM.c Sun Nov 10 22:09:50 2024
@@ -0,0 +1,34 @@
+$NetBSD: patch-TSRM_TSRM.c,v 1.1 2024/11/10 22:09:50 prlw1 Exp $
+
+Backport of
+
+https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28
+
+to fix
+
+Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
+No space available for static Thread Local Storage
+
+PR pkg/56717
+
+--- TSRM/TSRM.c.orig   2024-10-22 18:39:14.000000000 +0000
++++ TSRM/TSRM.c
+@@ -756,14 +756,16 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_of
+     // TODO: Implement support for fast JIT ZTS code ???
+       return 0;
+ #elif defined(__x86_64__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+-      !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
++      !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) \
++      && !defined(__HAIKU__)
+       size_t ret;
+ 
+       asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
+           : "=r" (ret));
+       return ret;
+ #elif defined(__i386__) && defined(__GNUC__) && !defined(__FreeBSD__) && \
+-      !defined(__OpenBSD__) && !defined(__MUSL__) && !defined(__HAIKU__)
++      !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__) && \
++      !defined(__HAIKU__)
+       size_t ret;
+ 
+       asm ("leal _tsrm_ls_cache@ntpoff,%0"
Index: pkgsrc/lang/php83/patches/patch-TSRM_TSRM.h
diff -u /dev/null pkgsrc/lang/php83/patches/patch-TSRM_TSRM.h:1.1
--- /dev/null   Sun Nov 10 22:09:50 2024
+++ pkgsrc/lang/php83/patches/patch-TSRM_TSRM.h Sun Nov 10 22:09:50 2024
@@ -0,0 +1,24 @@
+$NetBSD: patch-TSRM_TSRM.h,v 1.1 2024/11/10 22:09:50 prlw1 Exp $
+
+Backport of
+
+https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28
+
+to fix
+
+Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
+No space available for static Thread Local Storage
+
+PR pkg/56717
+
+--- TSRM/TSRM.h.orig   2024-10-22 18:39:14.000000000 +0000
++++ TSRM/TSRM.h
+@@ -149,7 +149,7 @@ TSRM_API bool tsrm_is_managed_thread(voi
+ # define __has_attribute(x) 0
+ #endif
+ 
+-#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__MUSL__) || defined(__HAIKU__)
++#if !__has_attribute(tls_model) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__MUSL__) || defined(__HAIKU__)
+ # define TSRM_TLS_MODEL_ATTR
+ # define TSRM_TLS_MODEL_DEFAULT
+ #elif __PIC__
Index: pkgsrc/lang/php83/patches/patch-ext_opcache_jit_zend__jit__x86.dasc
diff -u /dev/null pkgsrc/lang/php83/patches/patch-ext_opcache_jit_zend__jit__x86.dasc:1.1
--- /dev/null   Sun Nov 10 22:09:50 2024
+++ pkgsrc/lang/php83/patches/patch-ext_opcache_jit_zend__jit__x86.dasc Sun Nov 10 22:09:50 2024
@@ -0,0 +1,33 @@
+$NetBSD: patch-ext_opcache_jit_zend__jit__x86.dasc,v 1.1 2024/11/10 22:09:50 prlw1 Exp $
+
+Backport of
+
+https://github.com/php/php-src/commit/2d6bd1644d104fe934a5117d232d3f50ffe9ff28
+
+to fix
+
+Cannot load lib/httpd/mod_php8.so into server: /usr/pkg/lib/httpd/mod_php8.so:
+No space available for static Thread Local Storage
+
+PR pkg/56717
+
+--- ext/opcache/jit/zend_jit_x86.dasc.orig     2024-10-22 18:39:14.000000000 +0000
++++ ext/opcache/jit/zend_jit_x86.dasc
+@@ -2896,7 +2896,7 @@ static int zend_jit_setup(void)
+ # elif defined(__GNUC__) && defined(__x86_64__)
+       tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
+       if (tsrm_ls_cache_tcb_offset == 0) {
+-#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
++#if defined(__has_attribute) && __has_attribute(tls_model) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+               size_t ret;
+ 
+               asm ("movq _tsrm_ls_cache@gottpoff(%%rip),%0"
+@@ -2932,7 +2932,7 @@ static int zend_jit_setup(void)
+ # elif defined(__GNUC__) && defined(__i386__)
+       tsrm_ls_cache_tcb_offset = tsrm_get_ls_cache_tcb_offset();
+       if (tsrm_ls_cache_tcb_offset == 0) {
+-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__MUSL__)
+               size_t ret;
+ 
+               asm ("leal _tsrm_ls_cache@ntpoff,%0\n"