]>
Commit | Line | Data |
---|---|---|
50132798 ER |
1 | --- php-4.4.2/Makefile.global~ 2006-04-04 00:35:27.582384109 +0300 |
2 | +++ php-4.4.2/Makefile.global 2006-04-04 00:40:19.318848123 +0300 | |
3 | @@ -1,6 +1,7 @@ | |
4 | mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p | |
5 | INSTALL = $(top_srcdir)/build/shtool install -c | |
6 | INSTALL_DATA = $(INSTALL) -m 644 | |
10c3f6ac | 7 | +LD_VERSION_SCRIPT = -Wl,--version-script=$(top_srcdir)/php.ver |
50132798 ER |
8 | |
9 | DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir) | |
10 | COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH) | |
11 | --- /dev/null 2006-03-28 14:00:37.387408000 +0300 | |
12 | +++ php-4.4.2/php.ver 2006-04-04 00:40:55.609652026 +0300 | |
13 | @@ -0,0 +1 @@ | |
14 | +php5 { global: *; }; | |
15 | --- php-4.4.2/acinclude.m4~ 2006-04-03 21:43:42.852081966 +0300 | |
16 | +++ php-4.4.2/acinclude.m4 2006-04-04 00:47:58.259016152 +0300 | |
17 | @@ -1205,7 +1205,7 @@ | |
18 | ;; | |
19 | *[)] | |
20 | suffix=la | |
5a115a46 | 21 | - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' |
ef6241fc | 22 | + link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) libphp_common.la $(EXTRA_LDFLAGS) $(LD_VERSION_SCRIPT) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' |
50132798 ER |
23 | ;; |
24 | esac | |
25 | ||
26 | --- php-5.1.2/Makefile.global~ 2006-04-04 01:20:14.511991339 +0300 | |
27 | +++ php-5.1.2/Makefile.global 2006-04-04 01:20:51.782819766 +0300 | |
28 | @@ -15,15 +15,15 @@ | |
29 | build-modules: $(PHP_MODULES) | |
30 | ||
31 | libphp_common.la: $(PHP_GLOBAL_OBJS) | |
5a115a46 | 32 | - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION) |
5baf79a6 | 33 | + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(MAJOR_VERSION) |
50132798 ER |
34 | -@$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la >/dev/null 2>&1 |
35 | ||
36 | libphp5.la: libphp_common.la $(PHP_SAPI_OBJS) | |
5a115a46 ER |
37 | - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
38 | + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ | |
50132798 ER |
39 | -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1 |
40 | ||
41 | $(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS) | |
5a115a46 ER |
42 | - $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ |
43 | + $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(LD_VERSION_SCRIPT) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ | |
50132798 ER |
44 | -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1 |
45 | ||
46 | libtool-sapi: $(LIBTOOL_SAPI) | |
5baf79a6 ER |
47 | --- php-5.1.2/scripts/Makefile.frag~ 2006-04-20 23:23:53.928072405 +0300 |
48 | +++ php-5.1.2/scripts/Makefile.frag 2006-04-20 23:24:40.239103291 +0300 | |
49 | @@ -14,7 +14,8 @@ | |
50 | Makefile.global \ | |
51 | acinclude.m4 \ | |
52 | ltmain.sh \ | |
53 | - run-tests.php | |
54 | + run-tests.php \ | |
55 | + php.ver | |
56 | ||
57 | BUILD_FILES_EXEC = \ | |
58 | build/shtool \ | |
59 | --- php-5.1.2/scripts/phpize.in~ 2006-04-20 23:23:53.928072405 +0300 | |
60 | +++ php-5.1.2/scripts/phpize.in 2006-04-20 23:25:15.129879978 +0300 | |
61 | @@ -8,7 +8,7 @@ | |
62 | builddir="`pwd`" | |
63 | ||
64 | FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" | |
65 | -FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" | |
66 | +FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh php.ver run-tests*.php" | |
67 | CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ | |
68 | mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ | |
69 | aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ | |
70 | --- php-5.1.2/configure.in~ 2006-04-20 23:23:53.928072405 +0300 | |
71 | +++ php-5.1.2/configure.in 2006-04-20 23:25:45.300551605 +0300 | |
72 | @@ -1190,6 +1190,9 @@ | |
73 | PHP_SUBST(PHP_RPATHS) | |
74 | PHP_SUBST(PHP_SAPI) | |
75 | PHP_SUBST_OLD(PHP_VERSION) | |
76 | +PHP_SUBST_OLD(MAJOR_VERSION) | |
77 | +PHP_SUBST_OLD(MINOR_VERSION) | |
78 | +PHP_SUBST_OLD(RELEASE_VERSION) | |
79 | PHP_SUBST(SHELL) | |
80 | PHP_SUBST(SHARED_LIBTOOL) | |
81 | PHP_SUBST(WARNING_LEVEL) | |
c09ab008 ER |
82 | --- php-5.1.2/sapi/apache/mod_php5.c~ 2006-01-06 20:06:38.000000000 +0200 |
83 | +++ php-5.1.2/sapi/apache/mod_php5.c 2006-04-04 02:12:59.462271322 +0300 | |
84 | @@ -930,7 +930,9 @@ | |
85 | handler_rec php_handlers[] = | |
86 | { | |
87 | {"application/x-httpd-php", send_parsed_php}, | |
88 | + {"application/x-httpd-php5", send_parsed_php}, | |
89 | {"application/x-httpd-php-source", send_parsed_php_source}, | |
90 | + {"application/x-httpd-php5-source", send_parsed_php_source}, | |
91 | {"text/html", php_xbithack_handler}, | |
92 | {NULL} | |
93 | }; |