Commit c89b363fc97 for php.net
commit c89b363fc970ae661e167e86a451191e73c16932
Merge: 98258a3f5af db6cca26dd2
Author: Peter Kokot <peterkokot@gmail.com>
Date: Mon Feb 23 17:20:59 2026 +0100
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
sapi/*/Makefile.frag: install programs built with libtool, with libtool
diff --cc NEWS
index 4b2fa4b0adf,6a1388a961c..3e86ad6eb63
--- a/NEWS
+++ b/NEWS
@@@ -16,8 -11,12 +16,10 @@@ PH
. Fixed OSS-Fuzz #478009707 (Borked assign-op/inc/dec on untyped hooked
property backing value). (ilutov)
. Fixed bug GH-21215 (Build fails with -std=). (Arnaud)
+ . Fixed bug GH-13674 (Build system installs libtool wrappers when using
+ slibtool). (Michael Orlitzky)
- Curl:
- . Fixed bug GH-21023 (CURLOPT_XFERINFOFUNCTION crash with a null callback).
- (David Carlier)
. Don't truncate length. (ndossche)
- Date:
diff --cc sapi/phpdbg/Makefile.frag
index 3b09f6a2c88,aa1a1cd7942..a330cf7b6da
--- a/sapi/phpdbg/Makefile.frag
+++ b/sapi/phpdbg/Makefile.frag
@@@ -25,7 -25,7 +25,7 @@@ install-phpdbg: $(SAPI_PHPDBG_PATH
@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
@$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
- @$(INSTALL) -m 0755 $(SAPI_PHPDBG_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
- @$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
++ @$(LIBTOOL) --mode=install $(INSTALL) -m 0755 $(SAPI_PHPDBG_PATH) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
@echo "Installing phpdbg man page: $(INSTALL_ROOT)$(mandir)/man1/"
@$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1
@$(INSTALL_DATA) sapi/phpdbg/phpdbg.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)phpdbg$(program_suffix).1