File tree 5 files changed +23
-1
lines changed
5 files changed +23
-1
lines changed Original file line number Diff line number Diff line change 29
29
# Libtool library files generated during build process
30
30
* .la
31
31
32
+ # Mac shared library files generated during build process
33
+ * .dylib
34
+
32
35
# Directories created by Libtool for storing generated library files
33
36
.libs /
34
37
Original file line number Diff line number Diff line change 9
9
. Fixed bug GH-17984 (calls with arguments as array with references).
10
10
(David Carlier)
11
11
12
+ - Embed:
13
+ . Fixed bug GH-8533 (Unable to link dynamic libphp on Mac). (Kévin Dunglas)
14
+
12
15
- Mbstring:
13
16
. Fixed bug GH-17989 (mb_output_handler crash with unset
14
17
http_output_conv_mimetypes). (nielsdos)
Original file line number Diff line number Diff line change @@ -19,6 +19,10 @@ libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
19
19
$(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 $@
20
20
-@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
21
21
22
+ libphp.dylib: libphp.la
23
+ $(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 $@
24
+ -@$(LIBTOOL) --silent --tag=CC --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1
25
+
22
26
libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
23
27
$(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
24
28
Original file line number Diff line number Diff line change @@ -764,6 +764,14 @@ AC_DEFUN([PHP_BUILD_SHARED],[
764
764
php_lo=$shared_lo
765
765
] )
766
766
767
+ dnl
768
+ dnl PHP_BUILD_SHARED_DYLIB
769
+ dnl
770
+ AC_DEFUN ( [ PHP_BUILD_SHARED_DYLIB] ,[
771
+ PHP_BUILD_SHARED
772
+ OVERALL_TARGET=libphp.dylib
773
+ ] )
774
+
767
775
dnl
768
776
dnl PHP_BUILD_STATIC
769
777
dnl
@@ -876,6 +884,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[
876
884
case "$2 " in
877
885
static[ )] PHP_BUILD_STATIC;;
878
886
shared[ )] PHP_BUILD_SHARED;;
887
+ shared-dylib[ )] PHP_BUILD_SHARED_DYLIB;;
879
888
bundle[ )] PHP_BUILD_BUNDLE;;
880
889
esac
881
890
install_sapi="install-sapi"
Original file line number Diff line number Diff line change @@ -11,7 +11,10 @@ if test "$PHP_EMBED" != "no"; then
11
11
case "$PHP_EMBED" in
12
12
yes|shared)
13
13
LIBPHP_CFLAGS="-shared"
14
- PHP_EMBED_TYPE=shared
14
+ AS_CASE ( [ "$host_alias"] , [ *darwin*] , [
15
+ SAPI_SHARED="libs/libphp.dylib"
16
+ PHP_EMBED_TYPE=shared-dylib
17
+ ] , [ PHP_EMBED_TYPE=shared] )
15
18
INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
16
19
;;
17
20
static)
You can’t perform that action at this time.
0 commit comments