]> git.pld-linux.org Git - packages/php4.git/blame - php4-versioning.patch
projects / packages / php4.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 11 to rebuild with PostgreSQL 8.2
[packages/php4.git] / php4-versioning.patch
CommitLineData
caaacc6a
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
b4a56875 7+LD_VERSION_SCRIPT = -Wl,--version-script=$(top_srcdir)/php.ver
caaacc6a
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+php4 { global: *; };
5324171f
ER		 15--- php-4.4.2/acinclude.m4~ 2006-04-05 14:07:34.806469587 +0300
16+++ php-4.4.2/acinclude.m4 2006-04-05 14:07:59.667022065 +0300
caaacc6a
ER		 17@@ -1205,7 +1205,7 @@
18 ;;
19 *[)]
20 suffix=la
5324171f
ER		 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)'
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)'
caaacc6a
ER		 23 ;;
24 esac
25
5324171f
ER		 26# this would add dependency, but meanwhile require libphp_common.la linking at external extension build time. sigh
27#@@ -1215,7 +1215,7 @@
28# \$(phplibdir)/$1.$suffix: $3/$1.$suffix
29# \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
30#
31#-$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
32#+$3/$1.$suffix: libphp_common.la \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
33# $link_cmd
34#
35# EOF
36--- php-4.4.2/Makefile.global~ 2006-04-05 02:56:01.208583507 +0300
37+++ php-4.4.2/Makefile.global 2006-04-05 02:57:01.759935067 +0300
21cd5121 38@@ -16,14 +16,14 @@
caaacc6a
ER		 39 build-modules: $(PHP_MODULES)
40
41 libphp_common.la: $(PHP_GLOBAL_OBJS)
5324171f 42- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
44eb55f0 43+ $(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)
21cd5121 44 $(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
caaacc6a
ER		 45
46 libphp4.la: libphp_common.la $(PHP_SAPI_OBJS)
6fba27cc 47- $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
bfeee772 48+ $(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 $@
caaacc6a
ER		 49
50 $(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
6fba27cc 51- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
bfeee772 52+ $(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 $@
caaacc6a
ER		 53
54 libtool-sapi: $(LIBTOOL_SAPI)
55
5324171f
ER		 56--- php-4.4.2/scripts/Makefile.frag~ 2006-04-05 19:13:33.607375995 +0300
57+++ php-4.4.2/scripts/Makefile.frag 2006-04-05 19:20:46.147058812 +0300
58@@ -13,7 +13,8 @@
59 build/libtool.m4 \
60 Makefile.global \
61 acinclude.m4 \
62- ltmain.sh
63+ ltmain.sh \
64+ php.ver
65
66 BUILD_FILES_EXEC = \
67 build/shtool \
68--- php-4.4.2/scripts/phpize.in~ 2006-04-05 19:39:16.851897371 +0300
69+++ php-4.4.2/scripts/phpize.in 2006-04-05 19:39:17.921921323 +0300
70@@ -8,7 +8,7 @@
71 builddir="`pwd`"
72
73 FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
74-FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh"
75+FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh php.ver"
76 CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \
77 mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
78 aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
21cd5121
ER		 79--- php-4.4.2/configure.in~ 2006-04-13 14:14:51.449570523 +0300
80+++ php-4.4.2/configure.in 2006-04-15 15:37:40.676749564 +0300
81@@ -1165,6 +1165,9 @@
82 PHP_SUBST(PHP_RPATHS)
83 PHP_SUBST(PHP_SAPI)
84 PHP_SUBST_OLD(PHP_VERSION)
85+PHP_SUBST_OLD(MAJOR_VERSION)
86+PHP_SUBST_OLD(MINOR_VERSION)
87+PHP_SUBST_OLD(RELEASE_VERSION)
88 PHP_SUBST(PROG_SENDMAIL)
89 PHP_SUBST(RE2C)
90 PHP_SUBST(SHELL)
c144ec26
ER		 91--- php-4.4.2/sapi/apache/mod_php4.c~ 2006-01-01 15:47:01.000000000 +0200
92+++ php-4.4.2/sapi/apache/mod_php4.c 2006-04-04 02:02:52.348791307 +0300
93@@ -910,7 +910,9 @@
94 handler_rec php_handlers[] =
95 {
96 {"application/x-httpd-php", send_parsed_php},
97+ {"application/x-httpd-php4", send_parsed_php},
98 {"application/x-httpd-php-source", send_parsed_php_source},
99+ {"application/x-httpd-php4-source", send_parsed_php_source},
100 {"text/html", php_xbithack_handler},
101 {NULL}
102 };
PHP: Hypertext Preprocessor
This page took 0.037073 seconds and 4 git commands to generate.