php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  fix GH-8533: dynamic libphp linking on Mac
This commit is contained in:
Kévin Dunglas
2025-03-12 08:58:54 +01:00
parent d465449b05 009b5e2bfd
commit 74a455fb11
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -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/

4
build/Makefile.global
View File

@@ -18,6 +18,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) --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

9
build/php.m4
View File

@@ -779,6 +779,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
@@ -894,6 +902,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"

5
sapi/embed/config.m4
View File

@@ -11,7 +11,10 @@ if test "$PHP_EMBED" != "no"; then
AS_CASE([$PHP_EMBED],
[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)\$(orig_libdir); \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(orig_libdir)"
],
[static], [