Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 146 lines (129 sloc) 5.828 kB
9b04337 @tenderlove making patch easier to apply
authored
1 diff --git configure configure
cfd323f @tenderlove adding the php patch
authored
2 index 365e20e..7d116ab 100755
9b04337 @tenderlove making patch easier to apply
authored
3 --- configure
4 +++ configure
cfd323f @tenderlove adding the php patch
authored
5 @@ -3480,7 +3480,7 @@ if test "$GCC" = "yes"; then
6 ;;
7 esac
8 if test $GCC_MAJOR_VERSION -ge 4; then
9 - CFLAGS="$CFLAGS -fvisibility=hidden"
10 + CFLAGS="$CFLAGS"
11 fi
12 fi
13
14 @@ -4406,12 +4406,12 @@ IFS="- /.
15 build_type=shared
16 ;;
17 *darwin*)
18 - MH_BUNDLE_FLAGS="-dynamic -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
19 + MH_BUNDLE_FLAGS="-dylib -twolevel_namespace -bundle -bundle_loader $APXS_HTTPD"
20
21 PHP_VAR_SUBST="$PHP_VAR_SUBST MH_BUNDLE_FLAGS"
22
23 - SAPI_SHARED=libs/libphp5.so
24 - build_type=bundle
25 + SAPI_SHARED=libs/libphp5.dylib
26 + build_type=shared
27 ;;
28 *)
29 build_type=shared
30 @@ -107680,7 +107680,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
31 if test "$GCC" = yes ; then
32 output_verbose_link_cmd='echo'
33 archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
34 - module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
35 + module_cmds='$CC $allow_undefined_flag -fPIC -o $lib -dynamiclib $libobjs $deplibs$compiler_flags'
36 # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
37 archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
38 module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
9b04337 @tenderlove making patch easier to apply
authored
39 diff --git configure.in configure.in
cfd323f @tenderlove adding the php patch
authored
40 index dff131d..18c8e72 100644
9b04337 @tenderlove making patch easier to apply
authored
41 --- configure.in
42 +++ configure.in
cfd323f @tenderlove adding the php patch
authored
43 @@ -427,6 +427,7 @@ alloca.h \
44 arpa/inet.h \
45 arpa/nameser.h \
46 assert.h \
47 +crt_externs.h \
48 crypt.h \
49 fcntl.h \
50 grp.h \
9b04337 @tenderlove making patch easier to apply
authored
51 diff --git ext/spl/spl_dllist.h ext/spl/spl_dllist.h
cfd323f @tenderlove adding the php patch
authored
52 index 5b0998b..8360282 100644
9b04337 @tenderlove making patch easier to apply
authored
53 --- ext/spl/spl_dllist.h
54 +++ ext/spl/spl_dllist.h
cfd323f @tenderlove adding the php patch
authored
55 @@ -24,9 +24,9 @@
56 #include "php.h"
57 #include "php_spl.h"
58
59 -PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
60 -PHPAPI zend_class_entry *spl_ce_SplQueue;
61 -PHPAPI zend_class_entry *spl_ce_SplStack;
62 +extern PHPAPI zend_class_entry *spl_ce_SplDoublyLinkedList;
63 +extern PHPAPI zend_class_entry *spl_ce_SplQueue;
64 +extern PHPAPI zend_class_entry *spl_ce_SplStack;
65
66 PHP_MINIT_FUNCTION(spl_dllist);
67
9b04337 @tenderlove making patch easier to apply
authored
68 diff --git ext/spl/spl_fixedarray.h ext/spl/spl_fixedarray.h
cfd323f @tenderlove adding the php patch
authored
69 index dd556be..f9a2d90 100644
9b04337 @tenderlove making patch easier to apply
authored
70 --- ext/spl/spl_fixedarray.h
71 +++ ext/spl/spl_fixedarray.h
cfd323f @tenderlove adding the php patch
authored
72 @@ -22,7 +22,7 @@
73 #ifndef SPL_FIXEDARRAY_H
74 #define SPL_FIXEDARRAY_H
75
76 -PHPAPI zend_class_entry *spl_ce_SplFixedArray;
77 +extern PHPAPI zend_class_entry *spl_ce_SplFixedArray;
78
79 PHP_MINIT_FUNCTION(spl_fixedarray);
80
9b04337 @tenderlove making patch easier to apply
authored
81 diff --git ext/spl/spl_heap.h ext/spl/spl_heap.h
cfd323f @tenderlove adding the php patch
authored
82 index 56c82b5..1d29e57 100644
9b04337 @tenderlove making patch easier to apply
authored
83 --- ext/spl/spl_heap.h
84 +++ ext/spl/spl_heap.h
cfd323f @tenderlove adding the php patch
authored
85 @@ -24,11 +24,11 @@
86 #include "php.h"
87 #include "php_spl.h"
88
89 -PHPAPI zend_class_entry *spl_ce_SplHeap;
90 -PHPAPI zend_class_entry *spl_ce_SplMinHeap;
91 -PHPAPI zend_class_entry *spl_ce_SplMaxHeap;
92 +extern PHPAPI zend_class_entry *spl_ce_SplHeap;
93 +extern PHPAPI zend_class_entry *spl_ce_SplMinHeap;
94 +extern PHPAPI zend_class_entry *spl_ce_SplMaxHeap;
95
96 -PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;
97 +extern PHPAPI zend_class_entry *spl_ce_SplPriorityQueue;
98
99 PHP_MINIT_FUNCTION(spl_heap);
100
9b04337 @tenderlove making patch easier to apply
authored
101 diff --git main/php.h main/php.h
cfd323f @tenderlove adding the php patch
authored
102 index 58f4142..035d502 100644
9b04337 @tenderlove making patch easier to apply
authored
103 --- main/php.h
104 +++ main/php.h
cfd323f @tenderlove adding the php patch
authored
105 @@ -263,7 +263,13 @@ END_EXTERN_C()
106 #if !defined(PHP_WIN32)
107 #define PHP_SLEEP_NON_VOID
108 #define php_sleep sleep
109 +
110 +#if HAVE_CRT_EXTERNS_H
111 +#include <crt_externs.h>
112 +#define environ (*_NSGetEnviron())
113 +#else
114 extern char **environ;
115 +#endif
116 #endif /* !defined(PHP_WIN32) */
117
118 #ifdef PHP_PWRITE_64
9b04337 @tenderlove making patch easier to apply
authored
119 diff --git main/php_getopt.h main/php_getopt.h
cfd323f @tenderlove adding the php patch
authored
120 index 024ea5c..62f04d6 100644
9b04337 @tenderlove making patch easier to apply
authored
121 --- main/php_getopt.h
122 +++ main/php_getopt.h
cfd323f @tenderlove adding the php patch
authored
123 @@ -41,7 +41,7 @@ typedef struct _opt_struct {
124
125 BEGIN_EXTERN_C()
126 /* holds the index of the latest fetched element from the opts array */
127 -PHPAPI int php_optidx;
128 +extern PHPAPI int php_optidx;
129 PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start);
130 END_EXTERN_C()
131
9b04337 @tenderlove making patch easier to apply
authored
132 diff --git sapi/cli/config.m4 sapi/cli/config.m4
cfd323f @tenderlove adding the php patch
authored
133 index e804357..300b898 100644
9b04337 @tenderlove making patch easier to apply
authored
134 --- sapi/cli/config.m4
135 +++ sapi/cli/config.m4
cfd323f @tenderlove adding the php patch
authored
136 @@ -20,9 +20,6 @@ if test "$PHP_CLI" != "no"; then
137 BUILD_CLI="echo '\#! .' > php.sym && echo >>php.sym && nm -BCpg \`echo \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) | sed 's/\([A-Za-z0-9_]*\)\.lo/\1.o/g'\` | \$(AWK) '{ if (((\$\$2 == \"T\") || (\$\$2 == \"D\") || (\$\$2 == \"B\")) && (substr(\$\$3,1,1) != \".\")) { print \$\$3 } }' | sort -u >> php.sym && \$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) -Wl,-brtl -Wl,-bE:php.sym \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
138 fi
139 ;;
140 - *darwin*)
141 - BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
142 - ;;
143 *netware*)
144 BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o \$(SAPI_CLI_PATH)"
145 ;;
Something went wrong with that request. Please try again.