From 7837e6b970cfb743abb7e46e99d05795f1264c36 Mon Sep 17 00:00:00 2001 From: Ørjan Malde Date: Apr 02 2023 12:41:37 +0000 Subject: patches/php-8.1.10{_pre}.local.patch: universally use DESTDIR Signed-off-by: Ørjan Malde --- diff --git a/patches/php-8.1.10.local.patch b/patches/php-8.1.10.local.patch new file mode 100644 index 0000000..e9f551a --- /dev/null +++ b/patches/php-8.1.10.local.patch @@ -0,0 +1,399 @@ +diff -Nru php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S +--- php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100 ++++ php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S 2021-11-28 11:43:11.689492139 +0100 +@@ -0,0 +1,213 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/************************************************************************************* ++* ---------------------------------------------------------------------------------- * ++* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | * ++* ---------------------------------------------------------------------------------- * ++* | fc_mxcsr|fc_x87_cw| | fbr_strg | fc_dealloc | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | * ++* ---------------------------------------------------------------------------------- * ++* | limit | base | R12 | R13 | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | * ++* ---------------------------------------------------------------------------------- * ++* | R14 | R15 | RDI | RSI | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | * ++* ---------------------------------------------------------------------------------- * ++* | RBX | RBP | hidden | RIP | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | * ++* ---------------------------------------------------------------------------------- * ++* | parameter area | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | * ++* ---------------------------------------------------------------------------------- * ++* | FCTX | DATA | | * ++* ---------------------------------------------------------------------------------- * ++**************************************************************************************/ ++ ++.file "jump_x86_64_ms_pe_gas.asm" ++.text ++.p2align 4,,15 ++.def jump_fcontext; .scl 2; .type 32; .endef ++.seh_proc jump_fcontext ++jump_fcontext: ++.seh_endprologue ++ ++ leaq -0x118(%rsp), %rsp /* prepare stack */ ++ ++#if !defined(BOOST_USE_TSX) ++ /* save XMM storage */ ++ movaps %xmm6, 0x0(%rsp) ++ movaps %xmm7, 0x10(%rsp) ++ movaps %xmm8, 0x20(%rsp) ++ movaps %xmm9, 0x30(%rsp) ++ movaps %xmm10, 0x40(%rsp) ++ movaps %xmm11, 0x50(%rsp) ++ movaps %xmm12, 0x60(%rsp) ++ movaps %xmm13, 0x70(%rsp) ++ movaps %xmm14, 0x80(%rsp) ++ movaps %xmm15, 0x90(%rsp) ++ stmxcsr 0xa0(%rsp) /* save MMX control- and status-word */ ++ fnstcw 0xa4(%rsp) /* save x87 control-word */ ++#endif ++ ++ /* load NT_TIB */ ++ movq %gs:(0x30), %r10 ++ /* save fiber local storage */ ++ movq 0x20(%r10), %rax ++ movq %rax, 0xb0(%rsp) ++ /* save current deallocation stack */ ++ movq 0x1478(%r10), %rax ++ movq %rax, 0xb8(%rsp) ++ /* save current stack limit */ ++ movq 0x10(%r10), %rax ++ movq %rax, 0xc0(%rsp) ++ /* save current stack base */ ++ movq 0x08(%r10), %rax ++ movq %rax, 0xc8(%rsp) ++ ++ movq %r12, 0xd0(%rsp) /* save R12 */ ++ movq %r13, 0xd8(%rsp) /* save R13 */ ++ movq %r14, 0xe0(%rsp) /* save R14 */ ++ movq %r15, 0xe8(%rsp) /* save R15 */ ++ movq %rdi, 0xf0(%rsp) /* save RDI */ ++ movq %rsi, 0xf8(%rsp) /* save RSI */ ++ movq %rbx, 0x100(%rsp) /* save RBX */ ++ movq %rbp, 0x108(%rsp) /* save RBP */ ++ ++ movq %rcx, 0x110(%rsp) /* save hidden address of transport_t */ ++ ++ /* preserve RSP (pointing to context-data) in R9 */ ++ movq %rsp, %r9 ++ ++ /* restore RSP (pointing to context-data) from RDX */ ++ movq %rdx, %rsp ++ ++#if !defined(BOOST_USE_TSX) ++ /* restore XMM storage */ ++ movaps 0x0(%rsp), %xmm6 ++ movaps 0x10(%rsp), %xmm7 ++ movaps 0x20(%rsp), %xmm8 ++ movaps 0x30(%rsp), %xmm9 ++ movaps 0x40(%rsp), %xmm10 ++ movaps 0x50(%rsp), %xmm11 ++ movaps 0x60(%rsp), %xmm12 ++ movaps 0x70(%rsp), %xmm13 ++ movaps 0x80(%rsp), %xmm14 ++ movaps 0x90(%rsp), %xmm15 ++ ldmxcsr 0xa0(%rsp) /* restore MMX control- and status-word */ ++ fldcw 0xa4(%rsp) /* restore x87 control-word */ ++#endif ++ ++ /* load NT_TIB */ ++ movq %gs:(0x30), %r10 ++ /* restore fiber local storage */ ++ movq 0xb0(%rsp), %rax ++ movq %rax, 0x20(%r10) ++ /* restore current deallocation stack */ ++ movq 0xb8(%rsp), %rax ++ movq %rax, 0x1478(%r10) ++ /* restore current stack limit */ ++ movq 0xc0(%rsp), %rax ++ movq %rax, 0x10(%r10) ++ /* restore current stack base */ ++ movq 0xc8(%rsp), %rax ++ movq %rax, 0x08(%r10) ++ ++ movq 0xd0(%rsp), %r12 /* restore R12 */ ++ movq 0xd8(%rsp), %r13 /* restore R13 */ ++ movq 0xe0(%rsp), %r14 /* restore R14 */ ++ movq 0xe8(%rsp), %r15 /* restore R15 */ ++ movq 0xf0(%rsp), %rdi /* restore RDI */ ++ movq 0xf8(%rsp), %rsi /* restore RSI */ ++ movq 0x100(%rsp), %rbx /* restore RBX */ ++ movq 0x108(%rsp), %rbp /* restore RBP */ ++ ++ movq 0x110(%rsp), %rax /* restore hidden address of transport_t */ ++ ++ leaq 0x118(%rsp), %rsp /* prepare stack */ ++ ++ /* restore return-address */ ++ popq %r10 ++ ++ /* transport_t returned in RAX */ ++ /* return parent fcontext_t */ ++ movq %r9, 0x0(%rax) ++ /* return data */ ++ movq %r8, 0x8(%rax) ++ ++ /* transport_t as 1.arg of context-function */ ++ movq %rax, %rcx ++ ++ /* indirect jump to context */ ++ jmp *%r10 ++.seh_endproc ++ ++#ifdef __midipix__ ++ .section .got$jump_fcontext,"r" ++ .global __imp_jump_fcontext ++__imp_jump_fcontext: ++ .quad jump_fcontext ++ .linkonce discard ++#endif +diff -Nru php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S +--- php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100 ++++ php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S 2021-11-28 11:44:29.385178672 +0100 +@@ -0,0 +1,178 @@ ++/* ++ Copyright Oliver Kowalke 2009. ++ Copyright Thomas Sailer 2013. ++ Distributed under the Boost Software License, Version 1.0. ++ (See accompanying file LICENSE_1_0.txt or copy at ++ http://www.boost.org/LICENSE_1_0.txt) ++*/ ++ ++/************************************************************************************* ++* ---------------------------------------------------------------------------------- * ++* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | * ++* ---------------------------------------------------------------------------------- * ++* | SEE registers (XMM6-XMM15) | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | * ++* ---------------------------------------------------------------------------------- * ++* | fc_mxcsr|fc_x87_cw| | fbr_strg | fc_dealloc | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | * ++* ---------------------------------------------------------------------------------- * ++* | limit | base | R12 | R13 | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | * ++* ---------------------------------------------------------------------------------- * ++* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | * ++* ---------------------------------------------------------------------------------- * ++* | R14 | R15 | RDI | RSI | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | * ++* ---------------------------------------------------------------------------------- * ++* | RBX | RBP | hidden | RIP | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | * ++* ---------------------------------------------------------------------------------- * ++* | parameter area | * ++* ---------------------------------------------------------------------------------- * ++* ---------------------------------------------------------------------------------- * ++* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | * ++* ---------------------------------------------------------------------------------- * ++* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | * ++* ---------------------------------------------------------------------------------- * ++* | FCTX | DATA | | * ++* ---------------------------------------------------------------------------------- * ++**************************************************************************************/ ++ ++.file "make_x86_64_ms_pe_gas.asm" ++.text ++.p2align 4,,15 ++.def make_fcontext; .scl 2; .type 32; .endef ++.seh_proc make_fcontext ++make_fcontext: ++.seh_endprologue ++ ++ /* first arg of make_fcontext() == top of context-stack */ ++ movq %rcx, %rax ++ ++ /* shift address in RAX to lower 16 byte boundary */ ++ /* == pointer to fcontext_t and address of context stack */ ++ andq $-16, %rax ++ ++ /* reserve space for context-data on context-stack */ ++ /* on context-function entry: (RSP -0x8) % 16 == 0 */ ++ leaq -0x150(%rax), %rax ++ ++ /* third arg of make_fcontext() == address of context-function */ ++ movq %r8, 0x100(%rax) ++ ++ /* first arg of make_fcontext() == top of context-stack */ ++ /* save top address of context stack as 'base' */ ++ movq %rcx, 0xc8(%rax) ++ /* second arg of make_fcontext() == size of context-stack */ ++ /* negate stack size for LEA instruction (== substraction) */ ++ negq %rdx ++ /* compute bottom address of context stack (limit) */ ++ leaq (%rcx,%rdx), %rcx ++ /* save bottom address of context stack as 'limit' */ ++ movq %rcx, 0xc0(%rax) ++ /* save address of context stack limit as 'dealloction stack' */ ++ movq %rcx, 0xb8(%rax) ++ /* set fiber-storage to zero */ ++ xorq %rcx, %rcx ++ movq %rcx, 0xb0(%rax) ++ ++ /* save MMX control- and status-word */ ++ stmxcsr 0xa0(%rax) ++ /* save x87 control-word */ ++ fnstcw 0xa4(%rax) ++ ++ /* compute address of transport_t */ ++ leaq 0x140(%rax), %rcx ++ /* store address of transport_t in hidden field */ ++ movq %rcx, 0x110(%rax) ++ ++ /* compute abs address of label trampoline */ ++ leaq trampoline(%rip), %rcx ++ /* save address of finish as return-address for context-function */ ++ /* will be entered after jump_fcontext() first time */ ++ movq %rcx, 0x118(%rax) ++ ++ /* compute abs address of label finish */ ++ leaq finish(%rip), %rcx ++ /* save address of finish as return-address for context-function */ ++ /* will be entered after context-function returns */ ++ movq %rcx, 0x108(%rax) ++ ++ ret /* return pointer to context-data */ ++ ++trampoline: ++ /* store return address on stack */ ++ /* fix stack alignment */ ++ pushq %rbp ++ /* jump to context-function */ ++ jmp *%rbx ++ ++finish: ++ /* 32byte shadow-space for _exit() */ ++ andq $-32, %rsp ++ /* 32byte shadow-space for _exit() are */ ++ /* already reserved by make_fcontext() */ ++ /* exit code is zero */ ++ xorq %rcx, %rcx ++ /* exit application */ ++ call _exit ++ hlt ++.seh_endproc ++ ++.def _exit; .scl 2; .type 32; .endef /* standard C library function */ ++ ++#ifdef __midipix__ ++ .section .got$make_fcontext,"r" ++ .global __imp_make_fcontext ++__imp_make_fcontext: ++ .quad make_fcontext ++ .linkonce discard ++#endif diff --git a/patches/php-8.1.10_pre.local.patch b/patches/php-8.1.10_pre.local.patch index 4c97428..fd87d31 100644 --- a/patches/php-8.1.10_pre.local.patch +++ b/patches/php-8.1.10_pre.local.patch @@ -1,69 +1,104 @@ -diff -ru php-8.1.10.orig/sapi/cli/Makefile.frag php-8.1.10/sapi/cli/Makefile.frag ---- php-8.1.10.orig/sapi/cli/Makefile.frag 2022-11-08 17:54:00.260075317 +0100 -+++ php-8.1.10/sapi/cli/Makefile.frag 2022-11-08 17:53:43.524075216 +0100 -@@ -4,9 +4,9 @@ - $(BUILD_CLI) - - install-cli: $(SAPI_CLI_PATH) -- @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" -- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) -- @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) -- @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" -- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 -- @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 -+ @echo "Installing PHP CLI binary: $(DESTDIR)$(bindir)/" -+ @$(mkinstalldirs) $(DESTDIR)$(bindir) -+ @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) -+ @echo "Installing PHP CLI man page: $(DESTDIR)$(mandir)/man1/" -+ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -+ @$(INSTALL_DATA) sapi/cli/php.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 +diff -ru php-8.1.10.orig/build/libtool.m4 php-8.1.10/build/libtool.m4 +--- php-8.1.10.orig/build/libtool.m4 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/build/libtool.m4 2023-04-01 22:20:57.477316107 +0200 +@@ -56,10 +56,6 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" + +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- + # Prevent multiple expansion + define([AC_PROG_LIBTOOL], []) + ])# _AC_PROG_LIBTOOL +Only in php-8.1.10/build: libtool.m4.orig diff -ru php-8.1.10.orig/build/Makefile.global php-8.1.10/build/Makefile.global ---- php-8.1.10.orig/build/Makefile.global 2022-10-18 01:06:50.776890570 +0200 -+++ php-8.1.10/build/Makefile.global 2022-10-18 01:07:22.908889564 +0200 +--- php-8.1.10.orig/build/Makefile.global 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/build/Makefile.global 2023-04-02 14:00:07.654373585 +0200 @@ -11,9 +11,9 @@ - @echo "Don't forget to run 'make test'." - @echo - + @echo "Don't forget to run 'make test'." + @echo + -build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) +build-modules: $(PHP_MODULES) $(PHP_ZEND_EX) libphp.la - + -build-binaries: $(PHP_BINARIES) +build-binaries: $(PHP_BINARIES) libphp.la - + libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -@@ -41,10 +41,10 @@ - + $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ +@@ -26,7 +26,7 @@ + + install-sapi: $(OVERALL_TARGET) + @echo "Installing PHP SAPI module: $(PHP_SAPI)" +- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) ++ -@$(mkinstalldirs) $(DESTDIR)$(bindir) + -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \ + for i in 0.0.0 0.0 0; do \ + if test -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ +@@ -41,19 +41,19 @@ + install-modules: build-modules - @test -d modules && \ + @test -d modules && \ - $(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR) - @echo "Installing shared extensions: $(INSTALL_ROOT)$(EXTENSION_DIR)/" + $(mkinstalldirs) $(DESTDIR)$(EXTENSION_DIR) + @echo "Installing shared extensions: $(DESTDIR)$(EXTENSION_DIR)/" - @rm -f modules/*.la >/dev/null 2>&1 + @rm -f modules/*.la >/dev/null 2>&1 - @$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR) + @$(INSTALL) modules/* $(DESTDIR)$(EXTENSION_DIR) - - install-headers: - -@if test "$(INSTALL_HEADERS)"; then \ -diff -Nru php-8.1.0.orig/build/libtool.m4 php-8.1.0/build/libtool.m4 ---- php-8.1.0.orig/build/libtool.m4 2021-11-23 19:56:11.000000000 +0100 -+++ php-8.1.0/build/libtool.m4 2021-11-26 11:59:47.795396689 +0100 -@@ -56,10 +56,6 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" --# Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' --AC_SUBST(LIBTOOL)dnl -- - # Prevent multiple expansion - define([AC_PROG_LIBTOOL], []) - ])# _AC_PROG_LIBTOOL -diff -Nru php-8.1.0.orig/configure php-8.1.0/configure ---- php-8.1.0.orig/configure 2021-11-23 19:56:11.000000000 +0100 -+++ php-8.1.0/configure 2021-11-28 11:23:38.328485103 +0100 -@@ -7771,6 +7771,9 @@ + install-headers: + -@if test "$(INSTALL_HEADERS)"; then \ + for i in `echo $(INSTALL_HEADERS)`; do \ + i=`$(top_srcdir)/build/shtool path -d $$i`; \ +- paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ ++ paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \ + done; \ + $(mkinstalldirs) $$paths && \ +- echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ ++ echo "Installing header files: $(DESTDIR)$(phpincludedir)/" && \ + for i in `echo $(INSTALL_HEADERS)`; do \ + if test "$(PHP_PECL_EXTENSION)"; then \ + src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \ +@@ -61,12 +61,12 @@ + src=$$i; \ + fi; \ + if test -f "$(top_srcdir)/$$src"; then \ +- $(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ ++ $(INSTALL_DATA) $(top_srcdir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \ + elif test -f "$(top_builddir)/$$src"; then \ +- $(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \ ++ $(INSTALL_DATA) $(top_builddir)/$$src $(DESTDIR)$(phpincludedir)/$$i; \ + else \ +- (cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ +- cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ ++ (cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i; \ ++ cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null || true; \ + fi \ + done; \ + fi +diff -ru php-8.1.10.orig/configure php-8.1.10/configure +--- php-8.1.10.orig/configure 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/configure 2023-04-02 14:03:31.975117895 +0200 +@@ -7015,13 +7015,13 @@ + as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 + fi + +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` ++ APXS_LIBEXECDIR='$(DESTDIR)'`$APXS -q LIBEXECDIR` + if test -z `$APXS -q SYSCONFDIR`; then + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ + -i -n php" + else +- APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` ++ APXS_SYSCONFDIR='$(DESTDIR)'`$APXS -q SYSCONFDIR` + INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ + \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ + $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ +@@ -7775,6 +7775,9 @@ *darwin*) BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; @@ -73,16 +108,31 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure *) BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)" ;; -@@ -7982,7 +7982,7 @@ +@@ -7851,12 +7854,12 @@ + yes|shared) + LIBPHP_CFLAGS="-shared" + PHP_EMBED_TYPE=shared +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" ++ INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(DESTDIR)\$(prefix)/lib" + ;; + static) + LIBPHP_CFLAGS="-static" + PHP_EMBED_TYPE=static +- INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(INSTALL_ROOT)\$(prefix)/lib" ++ INSTALL_IT="\$(mkinstalldirs) \$(DESTDIR)\$(prefix)/lib; \$(INSTALL) -m 0644 $SAPI_STATIC \$(DESTDIR)\$(prefix)/lib" + ;; + *) + PHP_EMBED_TYPE=no +@@ -7979,7 +7982,7 @@ php_sapi_module=static ;; esac - install_sapi="install-sapi" + install_sapi="" - - + + case sapi/embed in -@@ -11403,14 +11406,12 @@ +@@ -11470,14 +11473,12 @@ BUILD_PHPDBG="\$(LIBTOOL) --mode=link \ \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ @@ -98,7 +148,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure BUILD_PHPDBG_SHARED="\$(LIBTOOL) --mode=link \ \$(CC) -shared -Wl,-soname,libphpdbg.so -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \ -@@ -11636,6 +11637,9 @@ +@@ -11703,6 +11704,9 @@ *darwin*) BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; @@ -108,7 +158,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure *) BUILD_CGI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) \$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)" ;; -@@ -21247,7 +21251,7 @@ +@@ -21314,7 +21318,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/libxml.$suffix \$(phplibdir) $ext_builddir/libxml.$suffix: \$(shared_objects_libxml) \$(LIBXML_SHARED_DEPENDENCIES) @@ -117,7 +167,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -21624,7 +21628,7 @@ +@@ -21691,7 +21695,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/openssl.$suffix \$(phplibdir) $ext_builddir/openssl.$suffix: \$(shared_objects_openssl) \$(OPENSSL_SHARED_DEPENDENCIES) @@ -126,7 +176,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -22705,7 +22709,7 @@ +@@ -22772,7 +22776,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/pcre.$suffix \$(phplibdir) $ext_builddir/pcre.$suffix: \$(shared_objects_pcre) \$(PCRE_SHARED_DEPENDENCIES) @@ -135,7 +185,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -24106,7 +24110,7 @@ +@@ -24173,7 +24177,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/sqlite3.$suffix \$(phplibdir) $ext_builddir/sqlite3.$suffix: \$(shared_objects_sqlite3) \$(SQLITE3_SHARED_DEPENDENCIES) @@ -144,7 +194,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -24652,7 +24656,7 @@ +@@ -24719,7 +24723,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/zlib.$suffix \$(phplibdir) $ext_builddir/zlib.$suffix: \$(shared_objects_zlib) \$(ZLIB_SHARED_DEPENDENCIES) @@ -153,7 +203,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -24969,7 +24973,7 @@ +@@ -25036,7 +25040,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir) $ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES) @@ -162,7 +212,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -25606,7 +25610,7 @@ +@@ -25673,7 +25677,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/bz2.$suffix \$(phplibdir) $ext_builddir/bz2.$suffix: \$(shared_objects_bz2) \$(BZ2_SHARED_DEPENDENCIES) @@ -171,7 +221,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -25918,7 +25922,7 @@ +@@ -25985,7 +25989,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/calendar.$suffix \$(phplibdir) $ext_builddir/calendar.$suffix: \$(shared_objects_calendar) \$(CALENDAR_SHARED_DEPENDENCIES) @@ -180,7 +230,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -26227,7 +26231,7 @@ +@@ -26294,7 +26298,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/ctype.$suffix \$(phplibdir) $ext_builddir/ctype.$suffix: \$(shared_objects_ctype) \$(CTYPE_SHARED_DEPENDENCIES) @@ -189,7 +239,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -27277,7 +27281,7 @@ +@@ -27344,7 +27348,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/curl.$suffix \$(phplibdir) $ext_builddir/curl.$suffix: \$(shared_objects_curl) \$(CURL_SHARED_DEPENDENCIES) @@ -198,7 +248,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -31630,7 +31634,7 @@ +@@ -31697,7 +31701,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir) $ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES) @@ -207,7 +257,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -32221,7 +32225,7 @@ +@@ -32594,7 +32598,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/dom.$suffix \$(phplibdir) $ext_builddir/dom.$suffix: \$(shared_objects_dom) \$(DOM_SHARED_DEPENDENCIES) @@ -216,7 +266,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -33684,7 +33688,7 @@ +@@ -34057,7 +34061,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/exif.$suffix \$(phplibdir) $ext_builddir/exif.$suffix: \$(shared_objects_exif) \$(EXIF_SHARED_DEPENDENCIES) @@ -225,7 +275,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -34870,7 +34874,7 @@ +@@ -35243,7 +35247,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/fileinfo.$suffix \$(phplibdir) $ext_builddir/fileinfo.$suffix: \$(shared_objects_fileinfo) \$(FILEINFO_SHARED_DEPENDENCIES) @@ -234,7 +284,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -35202,7 +35206,7 @@ +@@ -35575,7 +35579,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/filter.$suffix \$(phplibdir) $ext_builddir/filter.$suffix: \$(shared_objects_filter) \$(FILTER_SHARED_DEPENDENCIES) @@ -243,7 +293,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -35577,7 +35581,7 @@ +@@ -35950,7 +35954,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/ftp.$suffix \$(phplibdir) $ext_builddir/ftp.$suffix: \$(shared_objects_ftp) \$(FTP_SHARED_DEPENDENCIES) @@ -252,7 +302,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -40772,7 +40776,7 @@ +@@ -41144,7 +41148,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/gettext.$suffix \$(phplibdir) $ext_builddir/gettext.$suffix: \$(shared_objects_gettext) \$(GETTEXT_SHARED_DEPENDENCIES) @@ -261,7 +311,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -43440,7 +43444,7 @@ +@@ -43812,7 +43816,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/iconv.$suffix \$(phplibdir) $ext_builddir/iconv.$suffix: \$(shared_objects_iconv) \$(ICONV_SHARED_DEPENDENCIES) @@ -270,7 +320,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -49790,7 +49794,7 @@ +@@ -50165,7 +50169,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/mbstring.$suffix \$(phplibdir) $ext_builddir/mbstring.$suffix: \$(shared_objects_mbstring) \$(MBSTRING_SHARED_DEPENDENCIES) @@ -279,7 +329,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -54970,7 +54974,16 @@ +@@ -55345,7 +55349,16 @@ printf %s "checking for sysvipc shared memory support... " >&6; } if test "$cross_compiling" = yes then : @@ -297,7 +347,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -55846,7 +55859,7 @@ +@@ -56221,7 +56234,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/opcache.$suffix \$(phplibdir) $ext_builddir/opcache.$suffix: \$(shared_objects_opcache) \$(OPCACHE_SHARED_DEPENDENCIES) @@ -306,7 +356,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -65092,7 +65105,7 @@ +@@ -65467,7 +65480,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/posix.$suffix \$(phplibdir) $ext_builddir/posix.$suffix: \$(shared_objects_posix) \$(POSIX_SHARED_DEPENDENCIES) @@ -315,7 +365,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -68635,7 +68648,7 @@ +@@ -69010,7 +69023,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/readline.$suffix \$(phplibdir) $ext_builddir/readline.$suffix: \$(shared_objects_readline) \$(READLINE_SHARED_DEPENDENCIES) @@ -324,7 +374,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -69464,7 +69477,7 @@ +@@ -69839,7 +69852,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/session.$suffix \$(phplibdir) $ext_builddir/session.$suffix: \$(shared_objects_session) \$(SESSION_SHARED_DEPENDENCIES) @@ -333,7 +383,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -70001,7 +70014,7 @@ +@@ -70376,7 +70389,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/shmop.$suffix \$(phplibdir) $ext_builddir/shmop.$suffix: \$(shared_objects_shmop) \$(SHMOP_SHARED_DEPENDENCIES) @@ -342,7 +392,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -70553,7 +70566,7 @@ +@@ -70928,7 +70941,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/simplexml.$suffix \$(phplibdir) $ext_builddir/simplexml.$suffix: \$(shared_objects_simplexml) \$(SIMPLEXML_SHARED_DEPENDENCIES) @@ -351,7 +401,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -72343,7 +72356,7 @@ +@@ -72718,7 +72731,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/soap.$suffix \$(phplibdir) $ext_builddir/soap.$suffix: \$(shared_objects_soap) \$(SOAP_SHARED_DEPENDENCIES) @@ -360,7 +410,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -72854,7 +72867,7 @@ +@@ -73309,7 +73322,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/sockets.$suffix \$(phplibdir) $ext_builddir/sockets.$suffix: \$(shared_objects_sockets) \$(SOCKETS_SHARED_DEPENDENCIES) @@ -369,7 +419,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -78714,7 +78727,7 @@ +@@ -79177,7 +79190,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/sysvmsg.$suffix \$(phplibdir) $ext_builddir/sysvmsg.$suffix: \$(shared_objects_sysvmsg) \$(SYSVMSG_SHARED_DEPENDENCIES) @@ -378,7 +428,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -79020,7 +79033,7 @@ +@@ -79483,7 +79496,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/sysvsem.$suffix \$(phplibdir) $ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES) @@ -387,7 +437,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -79377,7 +79390,7 @@ +@@ -79840,7 +79853,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/sysvshm.$suffix \$(phplibdir) $ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) @@ -396,7 +446,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -80659,7 +80672,7 @@ +@@ -81122,7 +81135,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/tokenizer.$suffix \$(phplibdir) $ext_builddir/tokenizer.$suffix: \$(shared_objects_tokenizer) \$(TOKENIZER_SHARED_DEPENDENCIES) @@ -405,7 +455,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -81503,7 +81516,7 @@ +@@ -81966,7 +81979,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/xml.$suffix \$(phplibdir) $ext_builddir/xml.$suffix: \$(shared_objects_xml) \$(XML_SHARED_DEPENDENCIES) @@ -414,7 +464,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -82079,7 +82092,7 @@ +@@ -82542,7 +82555,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/xmlreader.$suffix \$(phplibdir) $ext_builddir/xmlreader.$suffix: \$(shared_objects_xmlreader) \$(XMLREADER_SHARED_DEPENDENCIES) @@ -423,7 +473,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -82655,7 +82668,7 @@ +@@ -83118,7 +83131,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/xmlwriter.$suffix \$(phplibdir) $ext_builddir/xmlwriter.$suffix: \$(shared_objects_xmlwriter) \$(XMLWRITER_SHARED_DEPENDENCIES) @@ -432,7 +482,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -83426,7 +83439,7 @@ +@@ -83889,7 +83902,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/xsl.$suffix \$(phplibdir) $ext_builddir/xsl.$suffix: \$(shared_objects_xsl) \$(XSL_SHARED_DEPENDENCIES) @@ -441,7 +491,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -83754,7 +83767,7 @@ +@@ -84217,7 +84230,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/zend_test.$suffix \$(phplibdir) $ext_builddir/zend_test.$suffix: \$(shared_objects_zend_test) \$(ZEND_TEST_SHARED_DEPENDENCIES) @@ -450,7 +500,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -85286,7 +85299,7 @@ +@@ -85749,7 +85762,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/zip.$suffix \$(phplibdir) $ext_builddir/zip.$suffix: \$(shared_objects_zip) \$(ZIP_SHARED_DEPENDENCIES) @@ -459,7 +509,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -86122,7 +86135,7 @@ +@@ -86585,7 +86598,7 @@ \$(LIBTOOL) --mode=install cp $ext_builddir/mysqlnd.$suffix \$(phplibdir) $ext_builddir/mysqlnd.$suffix: \$(shared_objects_mysqlnd) \$(MYSQLND_SHARED_DEPENDENCIES) @@ -468,7 +518,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure EOF -@@ -86355,7 +86368,7 @@ +@@ -86818,7 +86831,7 @@ enable_static=yes case $php_sapi_module in @@ -477,7 +527,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure if test "$PHP_CGI" = "no" && test "$PHP_CLI" = "no" && test "$PHP_FPM" = "no" && test "$PHP_LITESPEED" = "no" && test "$PHP_PHPDBG" = "no"; then enable_static=no fi -@@ -86369,12 +86382,6 @@ +@@ -86832,12 +86845,6 @@ esac EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; @@ -490,7 +540,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure esac EXTRA_LIBS="$EXTRA_LIBS $DLIBS $LIBS" -@@ -86541,6 +86548,8 @@ +@@ -87006,6 +87013,8 @@ fiber_os="mac" ;; #( aix*|os400*) : fiber_os="aix" ;; #( @@ -499,7 +549,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure *) : fiber_os="other" ;; -@@ -86572,6 +86581,8 @@ +@@ -87039,6 +87048,8 @@ if test "$fiber_os" = 'mac'; then fiber_asm_file="combined_sysv_macho_gas" @@ -508,7 +558,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure elif test "$fiber_os" = 'aix'; then # AIX uses a different calling convention (shared with non-_CALL_ELF Linux). # The AIX assembler isn't GNU, but the file is compatible. -@@ -86646,8 +86657,14 @@ +@@ -87113,8 +87124,14 @@ if test "x$ac_cv_header_ucontext_h" = xyes then : @@ -525,7 +575,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure else $as_nop -@@ -90670,7 +90687,7 @@ +@@ -91081,7 +91098,7 @@ lt_prog_compiler_static='-Bstatic' ;; @@ -534,7 +584,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) -@@ -92390,6 +92407,17 @@ +@@ -92801,6 +92818,17 @@ dynamic_linker='GNU/Linux ld.so' ;; @@ -552,7 +602,7 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure netbsd*) version_type=sunos need_lib_prefix=no -@@ -94461,7 +94489,7 @@ +@@ -94872,7 +94900,7 @@ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator_CXX=: ;; @@ -561,20 +611,183 @@ diff -Nru php-8.1.0.orig/configure php-8.1.0/configure case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler -diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag ---- php-8.1.0.orig/sapi/cgi/Makefile.frag 2021-11-23 19:56:11.000000000 +0100 -+++ php-8.1.0/sapi/cgi/Makefile.frag 2021-11-26 12:00:32.631397589 +0100 -@@ -6,7 +6,7 @@ +diff -ru php-8.1.10.orig/ext/pdo/Makefile.frag php-8.1.10/ext/pdo/Makefile.frag +--- php-8.1.10.orig/ext/pdo/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/ext/pdo/Makefile.frag 2023-04-02 14:01:59.387117333 +0200 +@@ -15,17 +15,17 @@ + fi) + + install-pdo-headers: +- @echo "Installing PDO headers: $(INSTALL_ROOT)$(phpincludedir)/ext/pdo/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/pdo ++ @echo "Installing PDO headers: $(DESTDIR)$(phpincludedir)/ext/pdo/" ++ @$(mkinstalldirs) $(DESTDIR)$(phpincludedir)/ext/pdo + @for f in $(PDO_HEADER_FILES); do \ + if test -f "$(top_srcdir)/$$f"; then \ +- $(INSTALL_DATA) $(top_srcdir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ ++ $(INSTALL_DATA) $(top_srcdir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_builddir)/$$f"; then \ +- $(INSTALL_DATA) $(top_builddir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ ++ $(INSTALL_DATA) $(top_builddir)/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_srcdir)/ext/pdo/$$f"; then \ +- $(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ ++ $(INSTALL_DATA) $(top_srcdir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ + elif test -f "$(top_builddir)/ext/pdo/$$f"; then \ +- $(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/pdo; \ ++ $(INSTALL_DATA) $(top_builddir)/ext/pdo/$$f $(DESTDIR)$(phpincludedir)/ext/pdo; \ + else \ + echo "hmmm"; \ + fi \ +diff -ru php-8.1.10.orig/ext/phar/Makefile.frag php-8.1.10/ext/phar/Makefile.frag +--- php-8.1.10.orig/ext/phar/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/ext/phar/Makefile.frag 2023-04-02 13:55:10.502990879 +0200 +@@ -23,7 +23,7 @@ + else \ + $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \ + fi;` +-PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` ++PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";` + + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc + -@test -d $(builddir)/phar || mkdir $(builddir)/phar +@@ -41,10 +41,10 @@ + -@chmod +x $(builddir)/phar.phar + + install-pharcmd: pharcmd +- -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- $(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix).phar +- -@rm -f $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) +- $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(INSTALL_ROOT)$(bindir)/$(program_prefix)phar$(program_suffix) +- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 +- @$(INSTALL_DATA) $(builddir)/phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1 +- @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1 ++ -@$(mkinstalldirs) $(DESTDIR)$(bindir) ++ $(INSTALL) $(builddir)/phar.phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix).phar ++ -@rm -f $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix) ++ $(LN_S) -f $(program_prefix)phar$(program_suffix).phar $(DESTDIR)$(bindir)/$(program_prefix)phar$(program_suffix) ++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ @$(INSTALL_DATA) $(builddir)/phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).1 ++ @$(INSTALL_DATA) $(builddir)/phar.phar.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phar$(program_suffix).phar.1 +diff -ru php-8.1.10.orig/pear/Makefile.frag php-8.1.10/pear/Makefile.frag +--- php-8.1.10.orig/pear/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/pear/Makefile.frag 2023-04-02 14:01:35.683117189 +0200 +@@ -13,7 +13,7 @@ + @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX} + + install-pear: +- @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" ++ @echo "Installing PEAR environment: $(DESTDIR)$(peardir)/" + @if test ! -f $(builddir)/install-pear-nozlib.phar; then \ + if test -f $(srcdir)/install-pear-nozlib.phar; then \ + cp $(srcdir)/install-pear-nozlib.phar $(builddir)/install-pear-nozlib.phar; \ +@@ -27,7 +27,7 @@ + fi \ + fi \ + fi +- @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ ++ @if test -f $(builddir)/install-pear-nozlib.phar && $(mkinstalldirs) $(DESTDIR)$(peardir); then \ + $(MAKE) -s install-pear-installer; \ + else \ + cat $(srcdir)/install-pear.txt; \ +diff -ru php-8.1.10.orig/sapi/cgi/Makefile.frag php-8.1.10/sapi/cgi/Makefile.frag +--- php-8.1.10.orig/sapi/cgi/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/sapi/cgi/Makefile.frag 2023-04-02 13:49:14.959756178 +0200 +@@ -4,9 +4,9 @@ + $(BUILD_CGI) + install-cgi: $(SAPI_CGI_PATH) - @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @echo "Installing PHP CGI binary: $(INSTALL_ROOT)$(bindir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) - @$(INSTALL) -m 0755 $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) -+ @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) - @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" - @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 ---- php-8.1.0/sapi/phpdbg/Makefile.frag.orig 2022-08-30 18:09:36.000000000 +0200 -+++ php-8.1.0/sapi/phpdbg/Makefile.frag 2022-12-27 12:07:50.745278819 +0100 +- @echo "Installing PHP CGI man page: $(INSTALL_ROOT)$(mandir)/man1/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 +- @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 ++ @echo "Installing PHP CGI binary: $(DESTDIR)$(bindir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(bindir) ++ @$(LIBTOOL) --mode=install cp $(SAPI_CGI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php-cgi$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP CGI man page: $(DESTDIR)$(mandir)/man1/" ++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ @$(INSTALL_DATA) sapi/cgi/php-cgi.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php-cgi$(program_suffix).1 +diff -ru php-8.1.10.orig/sapi/cli/Makefile.frag php-8.1.10/sapi/cli/Makefile.frag +--- php-8.1.10.orig/sapi/cli/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/sapi/cli/Makefile.frag 2023-04-01 22:20:57.477316107 +0200 +@@ -4,9 +4,9 @@ + $(BUILD_CLI) + + install-cli: $(SAPI_CLI_PATH) +- @echo "Installing PHP CLI binary: $(INSTALL_ROOT)$(bindir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_CLI_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) +- @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 +- @$(INSTALL_DATA) sapi/cli/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 ++ @echo "Installing PHP CLI binary: $(DESTDIR)$(bindir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(bindir) ++ @$(LIBTOOL) --mode=install cp $(SAPI_CLI_PATH) $(DESTDIR)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP CLI man page: $(DESTDIR)$(mandir)/man1/" ++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ @$(INSTALL_DATA) sapi/cli/php.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 +diff -ru php-8.1.10.orig/sapi/fpm/Makefile.frag php-8.1.10/sapi/fpm/Makefile.frag +--- php-8.1.10.orig/sapi/fpm/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/sapi/fpm/Makefile.frag 2023-04-02 13:51:05.086989390 +0200 +@@ -4,25 +4,25 @@ + $(BUILD_FPM) + + install-fpm: $(SAPI_FPM_PATH) +- @echo "Installing PHP FPM binary: $(INSTALL_ROOT)$(sbindir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(sbindir) +- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log +- @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run +- @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(INSTALL_ROOT)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) ++ @echo "Installing PHP FPM binary: $(DESTDIR)$(sbindir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(sbindir) ++ @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log ++ @$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run ++ @$(INSTALL) -m 0755 $(SAPI_FPM_PATH) $(DESTDIR)$(sbindir)/$(program_prefix)php-fpm$(program_suffix)$(EXEEXT) + +- @if test -f "$(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf"; then \ ++ @if test -f "$(DESTDIR)$(sysconfdir)/php-fpm.conf"; then \ + echo "Installing PHP FPM defconfig: skipping"; \ + else \ +- echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ +- $(mkinstalldirs) $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d; \ +- $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf.default; \ +- $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf.default; \ ++ echo "Installing PHP FPM defconfig: $(DESTDIR)$(sysconfdir)/" && \ ++ $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/php-fpm.d; \ ++ $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(DESTDIR)$(sysconfdir)/php-fpm.conf.default; \ ++ $(INSTALL_DATA) sapi/fpm/www.conf $(DESTDIR)$(sysconfdir)/php-fpm.d/www.conf.default; \ + fi + +- @echo "Installing PHP FPM man page: $(INSTALL_ROOT)$(mandir)/man8/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man8 +- @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(INSTALL_ROOT)$(mandir)/man8/php-fpm$(program_suffix).8 ++ @echo "Installing PHP FPM man page: $(DESTDIR)$(mandir)/man8/" ++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man8 ++ @$(INSTALL_DATA) sapi/fpm/php-fpm.8 $(DESTDIR)$(mandir)/man8/php-fpm$(program_suffix).8 + +- @echo "Installing PHP FPM status page: $(INSTALL_ROOT)$(datadir)/fpm/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(datadir)/fpm +- @$(INSTALL_DATA) sapi/fpm/status.html $(INSTALL_ROOT)$(datadir)/fpm/status.html ++ @echo "Installing PHP FPM status page: $(DESTDIR)$(datadir)/fpm/" ++ @$(mkinstalldirs) $(DESTDIR)$(datadir)/fpm ++ @$(INSTALL_DATA) sapi/fpm/status.html $(DESTDIR)$(datadir)/fpm/status.html +diff -ru php-8.1.10.orig/sapi/litespeed/Makefile.frag php-8.1.10/sapi/litespeed/Makefile.frag +--- php-8.1.10.orig/sapi/litespeed/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/sapi/litespeed/Makefile.frag 2023-04-02 14:02:49.307117636 +0200 +@@ -4,6 +4,6 @@ + $(BUILD_LITESPEED) + + install-litespeed: $(SAPI_LITESPEED_PATH) +- @echo "Installing PHP LiteSpeed binary: $(INSTALL_ROOT)$(bindir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) +- @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)lsphp$(program_suffix) ++ @echo "Installing PHP LiteSpeed binary: $(DESTDIR)$(bindir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(bindir) ++ @$(INSTALL) -m 0755 $(SAPI_LITESPEED_PATH) $(DESTDIR)$(bindir)/$(program_prefix)lsphp$(program_suffix) +diff -ru php-8.1.10.orig/sapi/phpdbg/Makefile.frag php-8.1.10/sapi/phpdbg/Makefile.frag +--- php-8.1.10.orig/sapi/phpdbg/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/sapi/phpdbg/Makefile.frag 2023-04-01 22:20:57.493316108 +0200 @@ -21,11 +21,11 @@ @$(YACC) $(YFLAGS) -v -d $(srcdir)/phpdbg_parser.y -o $@ @@ -595,9 +808,47 @@ diff -Nru php-8.1.0.orig/sapi/cgi/Makefile.frag php-8.1.0/sapi/cgi/Makefile.frag + @echo "Installing phpdbg man page: $(DESTDIR)$(mandir)/man1/" + @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 + @$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1 -diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h ---- php-8.1.0.orig/TSRM/TSRM.h 2021-11-23 19:56:11.000000000 +0100 -+++ php-8.1.0/TSRM/TSRM.h 2021-11-26 12:02:01.263399370 +0100 +diff -ru php-8.1.10.orig/scripts/Makefile.frag php-8.1.10/scripts/Makefile.frag +--- php-8.1.10.orig/scripts/Makefile.frag 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/scripts/Makefile.frag 2023-04-02 13:59:06.826373216 +0200 +@@ -27,24 +27,24 @@ + man_PAGES = phpize php-config + + install-build: +- @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(phpbuilddir) $(INSTALL_ROOT)$(bindir) && \ ++ @echo "Installing build environment: $(DESTDIR)$(phpbuilddir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \ + (cd $(top_srcdir) && \ +- $(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \ +- $(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir)) ++ $(INSTALL) $(BUILD_FILES_EXEC) $(DESTDIR)$(phpbuilddir) && \ ++ $(INSTALL_DATA) $(BUILD_FILES) $(DESTDIR)$(phpbuilddir)) + + install-programs: $(builddir)/phpize $(builddir)/php-config +- @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) ++ @echo "Installing helper programs: $(DESTDIR)$(bindir)/" ++ @$(mkinstalldirs) $(DESTDIR)$(bindir) + @for prog in $(bin_SCRIPTS); do \ + echo " program: $(program_prefix)$${prog}$(program_suffix)"; \ +- $(INSTALL) -m 755 $(builddir)/$${prog} $(INSTALL_ROOT)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \ ++ $(INSTALL) -m 755 $(builddir)/$${prog} $(DESTDIR)$(bindir)/$(program_prefix)$${prog}$(program_suffix); \ + done +- @echo "Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/" +- @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 ++ @echo "Installing man pages: $(DESTDIR)$(mandir)/man1/" ++ @$(mkinstalldirs) $(DESTDIR)$(mandir)/man1 + @for page in $(man_PAGES); do \ + echo " page: $(program_prefix)$${page}$(program_suffix).1"; \ +- $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \ ++ $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(DESTDIR)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \ + done + + $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status +diff -ru php-8.1.10.orig/TSRM/TSRM.h php-8.1.10/TSRM/TSRM.h +--- php-8.1.10.orig/TSRM/TSRM.h 2022-08-30 18:09:36.000000000 +0200 ++++ php-8.1.10/TSRM/TSRM.h 2023-04-01 22:20:57.493316108 +0200 @@ -147,7 +147,7 @@ # define __has_attribute(x) 0 #endif @@ -607,402 +858,4 @@ diff -Nru php-8.1.0.orig/TSRM/TSRM.h php-8.1.0/TSRM/TSRM.h # define TSRM_TLS_MODEL_ATTR #elif __PIC__ # define TSRM_TLS_MODEL_ATTR __attribute__((tls_model("initial-exec"))) -diff -Nru php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S ---- php-8.1.0.orig/Zend/asm/jump_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100 -+++ php-8.1.0/Zend/asm/jump_x86_64_ms_pe_gas.S 2021-11-28 11:43:11.689492139 +0100 -@@ -0,0 +1,213 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/************************************************************************************* -+* ---------------------------------------------------------------------------------- * -+* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | * -+* ---------------------------------------------------------------------------------- * -+* | fc_mxcsr|fc_x87_cw| | fbr_strg | fc_dealloc | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | * -+* ---------------------------------------------------------------------------------- * -+* | limit | base | R12 | R13 | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | * -+* ---------------------------------------------------------------------------------- * -+* | R14 | R15 | RDI | RSI | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | * -+* ---------------------------------------------------------------------------------- * -+* | RBX | RBP | hidden | RIP | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | * -+* ---------------------------------------------------------------------------------- * -+* | parameter area | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | * -+* ---------------------------------------------------------------------------------- * -+* | FCTX | DATA | | * -+* ---------------------------------------------------------------------------------- * -+**************************************************************************************/ -+ -+.file "jump_x86_64_ms_pe_gas.asm" -+.text -+.p2align 4,,15 -+.def jump_fcontext; .scl 2; .type 32; .endef -+.seh_proc jump_fcontext -+jump_fcontext: -+.seh_endprologue -+ -+ leaq -0x118(%rsp), %rsp /* prepare stack */ -+ -+#if !defined(BOOST_USE_TSX) -+ /* save XMM storage */ -+ movaps %xmm6, 0x0(%rsp) -+ movaps %xmm7, 0x10(%rsp) -+ movaps %xmm8, 0x20(%rsp) -+ movaps %xmm9, 0x30(%rsp) -+ movaps %xmm10, 0x40(%rsp) -+ movaps %xmm11, 0x50(%rsp) -+ movaps %xmm12, 0x60(%rsp) -+ movaps %xmm13, 0x70(%rsp) -+ movaps %xmm14, 0x80(%rsp) -+ movaps %xmm15, 0x90(%rsp) -+ stmxcsr 0xa0(%rsp) /* save MMX control- and status-word */ -+ fnstcw 0xa4(%rsp) /* save x87 control-word */ -+#endif -+ -+ /* load NT_TIB */ -+ movq %gs:(0x30), %r10 -+ /* save fiber local storage */ -+ movq 0x20(%r10), %rax -+ movq %rax, 0xb0(%rsp) -+ /* save current deallocation stack */ -+ movq 0x1478(%r10), %rax -+ movq %rax, 0xb8(%rsp) -+ /* save current stack limit */ -+ movq 0x10(%r10), %rax -+ movq %rax, 0xc0(%rsp) -+ /* save current stack base */ -+ movq 0x08(%r10), %rax -+ movq %rax, 0xc8(%rsp) -+ -+ movq %r12, 0xd0(%rsp) /* save R12 */ -+ movq %r13, 0xd8(%rsp) /* save R13 */ -+ movq %r14, 0xe0(%rsp) /* save R14 */ -+ movq %r15, 0xe8(%rsp) /* save R15 */ -+ movq %rdi, 0xf0(%rsp) /* save RDI */ -+ movq %rsi, 0xf8(%rsp) /* save RSI */ -+ movq %rbx, 0x100(%rsp) /* save RBX */ -+ movq %rbp, 0x108(%rsp) /* save RBP */ -+ -+ movq %rcx, 0x110(%rsp) /* save hidden address of transport_t */ -+ -+ /* preserve RSP (pointing to context-data) in R9 */ -+ movq %rsp, %r9 -+ -+ /* restore RSP (pointing to context-data) from RDX */ -+ movq %rdx, %rsp -+ -+#if !defined(BOOST_USE_TSX) -+ /* restore XMM storage */ -+ movaps 0x0(%rsp), %xmm6 -+ movaps 0x10(%rsp), %xmm7 -+ movaps 0x20(%rsp), %xmm8 -+ movaps 0x30(%rsp), %xmm9 -+ movaps 0x40(%rsp), %xmm10 -+ movaps 0x50(%rsp), %xmm11 -+ movaps 0x60(%rsp), %xmm12 -+ movaps 0x70(%rsp), %xmm13 -+ movaps 0x80(%rsp), %xmm14 -+ movaps 0x90(%rsp), %xmm15 -+ ldmxcsr 0xa0(%rsp) /* restore MMX control- and status-word */ -+ fldcw 0xa4(%rsp) /* restore x87 control-word */ -+#endif -+ -+ /* load NT_TIB */ -+ movq %gs:(0x30), %r10 -+ /* restore fiber local storage */ -+ movq 0xb0(%rsp), %rax -+ movq %rax, 0x20(%r10) -+ /* restore current deallocation stack */ -+ movq 0xb8(%rsp), %rax -+ movq %rax, 0x1478(%r10) -+ /* restore current stack limit */ -+ movq 0xc0(%rsp), %rax -+ movq %rax, 0x10(%r10) -+ /* restore current stack base */ -+ movq 0xc8(%rsp), %rax -+ movq %rax, 0x08(%r10) -+ -+ movq 0xd0(%rsp), %r12 /* restore R12 */ -+ movq 0xd8(%rsp), %r13 /* restore R13 */ -+ movq 0xe0(%rsp), %r14 /* restore R14 */ -+ movq 0xe8(%rsp), %r15 /* restore R15 */ -+ movq 0xf0(%rsp), %rdi /* restore RDI */ -+ movq 0xf8(%rsp), %rsi /* restore RSI */ -+ movq 0x100(%rsp), %rbx /* restore RBX */ -+ movq 0x108(%rsp), %rbp /* restore RBP */ -+ -+ movq 0x110(%rsp), %rax /* restore hidden address of transport_t */ -+ -+ leaq 0x118(%rsp), %rsp /* prepare stack */ -+ -+ /* restore return-address */ -+ popq %r10 -+ -+ /* transport_t returned in RAX */ -+ /* return parent fcontext_t */ -+ movq %r9, 0x0(%rax) -+ /* return data */ -+ movq %r8, 0x8(%rax) -+ -+ /* transport_t as 1.arg of context-function */ -+ movq %rax, %rcx -+ -+ /* indirect jump to context */ -+ jmp *%r10 -+.seh_endproc -+ -+#ifdef __midipix__ -+ .section .got$jump_fcontext,"r" -+ .global __imp_jump_fcontext -+__imp_jump_fcontext: -+ .quad jump_fcontext -+ .linkonce discard -+#endif -diff -Nru php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S ---- php-8.1.0.orig/Zend/asm/make_x86_64_ms_pe_gas.S 1970-01-01 01:00:00.000000000 +0100 -+++ php-8.1.0/Zend/asm/make_x86_64_ms_pe_gas.S 2021-11-28 11:44:29.385178672 +0100 -@@ -0,0 +1,178 @@ -+/* -+ Copyright Oliver Kowalke 2009. -+ Copyright Thomas Sailer 2013. -+ Distributed under the Boost Software License, Version 1.0. -+ (See accompanying file LICENSE_1_0.txt or copy at -+ http://www.boost.org/LICENSE_1_0.txt) -+*/ -+ -+/************************************************************************************* -+* ---------------------------------------------------------------------------------- * -+* | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x0 | 0x4 | 0x8 | 0xc | 0x10 | 0x14 | 0x18 | 0x1c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x20 | 0x24 | 0x28 | 0x2c | 0x30 | 0x34 | 0x38 | 0x3c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xe40 | 0x44 | 0x48 | 0x4c | 0x50 | 0x54 | 0x58 | 0x5c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x60 | 0x64 | 0x68 | 0x6c | 0x70 | 0x74 | 0x78 | 0x7c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 32 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x80 | 0x84 | 0x88 | 0x8c | 0x90 | 0x94 | 0x98 | 0x9c | * -+* ---------------------------------------------------------------------------------- * -+* | SEE registers (XMM6-XMM15) | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xa0 | 0xa4 | 0xa8 | 0xac | 0xb0 | 0xb4 | 0xb8 | 0xbc | * -+* ---------------------------------------------------------------------------------- * -+* | fc_mxcsr|fc_x87_cw| | fbr_strg | fc_dealloc | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 47 | 48 | 49 | 50 | 51 | 52 | 53 | 54 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xc0 | 0xc4 | 0xc8 | 0xcc | 0xd0 | 0xd4 | 0xd8 | 0xdc | * -+* ---------------------------------------------------------------------------------- * -+* | limit | base | R12 | R13 | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 55 | 56 | 57 | 58 | 59 | 60 | 61 | 62 | * -+* ---------------------------------------------------------------------------------- * -+* | 0xe0 | 0xe4 | 0xe8 | 0xec | 0xf0 | 0xf4 | 0xf8 | 0xfc | * -+* ---------------------------------------------------------------------------------- * -+* | R14 | R15 | RDI | RSI | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 63 | 64 | 65 | 66 | 67 | 68 | 69 | 70 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x100 | 0x104 | 0x108 | 0x10c | 0x110 | 0x114 | 0x118 | 0x11c | * -+* ---------------------------------------------------------------------------------- * -+* | RBX | RBP | hidden | RIP | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 71 | 72 | 73 | 74 | 75 | 76 | 77 | 78 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x120 | 0x124 | 0x128 | 0x12c | 0x130 | 0x134 | 0x138 | 0x13c | * -+* ---------------------------------------------------------------------------------- * -+* | parameter area | * -+* ---------------------------------------------------------------------------------- * -+* ---------------------------------------------------------------------------------- * -+* | 79 | 80 | 81 | 82 | 83 | 84 | 85 | 86 | * -+* ---------------------------------------------------------------------------------- * -+* | 0x140 | 0x144 | 0x148 | 0x14c | 0x150 | 0x154 | 0x158 | 0x15c | * -+* ---------------------------------------------------------------------------------- * -+* | FCTX | DATA | | * -+* ---------------------------------------------------------------------------------- * -+**************************************************************************************/ -+ -+.file "make_x86_64_ms_pe_gas.asm" -+.text -+.p2align 4,,15 -+.def make_fcontext; .scl 2; .type 32; .endef -+.seh_proc make_fcontext -+make_fcontext: -+.seh_endprologue -+ -+ /* first arg of make_fcontext() == top of context-stack */ -+ movq %rcx, %rax -+ -+ /* shift address in RAX to lower 16 byte boundary */ -+ /* == pointer to fcontext_t and address of context stack */ -+ andq $-16, %rax -+ -+ /* reserve space for context-data on context-stack */ -+ /* on context-function entry: (RSP -0x8) % 16 == 0 */ -+ leaq -0x150(%rax), %rax -+ -+ /* third arg of make_fcontext() == address of context-function */ -+ movq %r8, 0x100(%rax) -+ -+ /* first arg of make_fcontext() == top of context-stack */ -+ /* save top address of context stack as 'base' */ -+ movq %rcx, 0xc8(%rax) -+ /* second arg of make_fcontext() == size of context-stack */ -+ /* negate stack size for LEA instruction (== substraction) */ -+ negq %rdx -+ /* compute bottom address of context stack (limit) */ -+ leaq (%rcx,%rdx), %rcx -+ /* save bottom address of context stack as 'limit' */ -+ movq %rcx, 0xc0(%rax) -+ /* save address of context stack limit as 'dealloction stack' */ -+ movq %rcx, 0xb8(%rax) -+ /* set fiber-storage to zero */ -+ xorq %rcx, %rcx -+ movq %rcx, 0xb0(%rax) -+ -+ /* save MMX control- and status-word */ -+ stmxcsr 0xa0(%rax) -+ /* save x87 control-word */ -+ fnstcw 0xa4(%rax) -+ -+ /* compute address of transport_t */ -+ leaq 0x140(%rax), %rcx -+ /* store address of transport_t in hidden field */ -+ movq %rcx, 0x110(%rax) -+ -+ /* compute abs address of label trampoline */ -+ leaq trampoline(%rip), %rcx -+ /* save address of finish as return-address for context-function */ -+ /* will be entered after jump_fcontext() first time */ -+ movq %rcx, 0x118(%rax) -+ -+ /* compute abs address of label finish */ -+ leaq finish(%rip), %rcx -+ /* save address of finish as return-address for context-function */ -+ /* will be entered after context-function returns */ -+ movq %rcx, 0x108(%rax) -+ -+ ret /* return pointer to context-data */ -+ -+trampoline: -+ /* store return address on stack */ -+ /* fix stack alignment */ -+ pushq %rbp -+ /* jump to context-function */ -+ jmp *%rbx -+ -+finish: -+ /* 32byte shadow-space for _exit() */ -+ andq $-32, %rsp -+ /* 32byte shadow-space for _exit() are */ -+ /* already reserved by make_fcontext() */ -+ /* exit code is zero */ -+ xorq %rcx, %rcx -+ /* exit application */ -+ call _exit -+ hlt -+.seh_endproc -+ -+.def _exit; .scl 2; .type 32; .endef /* standard C library function */ -+ -+#ifdef __midipix__ -+ .section .got$make_fcontext,"r" -+ .global __imp_make_fcontext -+__imp_make_fcontext: -+ .quad make_fcontext -+ .linkonce discard -+#endif +Only in php-8.1.10/TSRM: TSRM.h.orig