From 009b5e2bfd497c3abdd645ec60bbdb90787de6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <kevin@dunglas.fr>
Date: Mon, 16 Dec 2024 22:16:18 +0100
Subject: [PATCH 1/2] fix GH-8533: dynamic libphp linking on Mac

Pass the -dynamiclib flag to libtool to build
a valid Mac dylib.

Closes GH-8533.
---
 .gitignore            | 3 +++
 NEWS                  | 3 +++
 build/Makefile.global | 4 ++++
 build/php.m4          | 9 +++++++++
 sapi/embed/config.m4  | 5 ++++-
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b9e60cc6b5bde..4e95d9a9da33d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,9 @@
 # Libtool library files generated during build process
 *.la
 
+# Mac shared library files generated during build process
+*.dylib
+
 # Directories created by Libtool for storing generated library files
 .libs/
 
diff --git a/NEWS b/NEWS
index aeffd4ece47dc..c54938982f5fa 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,9 @@ PHP                                                                        NEWS
   . Fixed bug GH-17984 (calls with arguments as array with references).
     (David Carlier)
 
+- Embed:
+  . Fixed bug GH-8533 (Unable to link dynamic libphp on Mac). (Kévin Dunglas)
+
 - Mbstring:
   . Fixed bug GH-17989 (mb_output_handler crash with unset
     http_output_conv_mimetypes). (nielsdos)
diff --git a/build/Makefile.global b/build/Makefile.global
index b11ce20aae87a..ec19efcbc5894 100644
--- a/build/Makefile.global
+++ b/build/Makefile.global
@@ -19,6 +19,10 @@ libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(LIBTOOL) --tag=CC --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 $@
 	-@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
 
+libphp.dylib: libphp.la
+	$(LIBTOOL) --tag=CC --mode=link $(CC) -dynamiclib $(LIBPHP_CFLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -rpath $(phptempdir) -install_name @rpath/$@ $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+	-@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
+
 libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
 	$(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so
 
diff --git a/build/php.m4 b/build/php.m4
index 61ee5c167536b..142ddf08fd98b 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -764,6 +764,14 @@ AC_DEFUN([PHP_BUILD_SHARED],[
   php_lo=$shared_lo
 ])
 
+dnl
+dnl PHP_BUILD_SHARED_DYLIB
+dnl
+AC_DEFUN([PHP_BUILD_SHARED_DYLIB],[
+  PHP_BUILD_SHARED
+  OVERALL_TARGET=libphp.dylib
+])
+
 dnl
 dnl PHP_BUILD_STATIC
 dnl
@@ -876,6 +884,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[
     case "$2" in
     static[)] PHP_BUILD_STATIC;;
     shared[)] PHP_BUILD_SHARED;;
+    shared-dylib[)] PHP_BUILD_SHARED_DYLIB;;
     bundle[)] PHP_BUILD_BUNDLE;;
     esac
     install_sapi="install-sapi"
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4
index 39d7dcf0a3ff2..71aab64e6fa52 100644
--- a/sapi/embed/config.m4
+++ b/sapi/embed/config.m4
@@ -11,7 +11,10 @@ if test "$PHP_EMBED" != "no"; then
   case "$PHP_EMBED" in
     yes|shared)
       LIBPHP_CFLAGS="-shared"
-      PHP_EMBED_TYPE=shared
+      AS_CASE(["$host_alias"], [*darwin*], [
+        SAPI_SHARED="libs/libphp.dylib"
+        PHP_EMBED_TYPE=shared-dylib
+      ], [PHP_EMBED_TYPE=shared])
       INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
       ;;
     static)

From 7f0d4e36de3be89c7133ad09d903e51942f74dd5 Mon Sep 17 00:00:00 2001
From: DanielEScherzer <daniel.e.scherzer@gmail.com>
Date: Wed, 12 Mar 2025 03:54:11 -0700
Subject: [PATCH 2/2] access_modifiers_002.phpt: fix test name [skip ci]
 (GH-18027)

"Attributes" has taken on another meaning since this test was created in 2007
---
 Zend/tests/access_modifiers/access_modifiers_002.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zend/tests/access_modifiers/access_modifiers_002.phpt b/Zend/tests/access_modifiers/access_modifiers_002.phpt
index 9830258c619b4..835d7445aac08 100644
--- a/Zend/tests/access_modifiers/access_modifiers_002.phpt
+++ b/Zend/tests/access_modifiers/access_modifiers_002.phpt
@@ -1,5 +1,5 @@
 --TEST--
-using multiple access modifiers (attributes)
+using multiple access modifiers (properties)
 --FILE--
 <?php