diff options
author | Justin Patrin <papercrane@gmail.com> | 2006-08-20 02:31:20 +0000 |
---|---|---|
committer | Justin Patrin <papercrane@gmail.com> | 2006-08-20 02:31:20 +0000 |
commit | 808faadfbea5deb79b4bb14c64a6e8df4c4466e4 (patch) | |
tree | 98b61ee13b84d047f1200cc13f42afffbcd31fc8 /packages | |
parent | 3713cf969e4073f08cc096f122032e9000674225 (diff) |
php: upgrade PHP5 to 5.1.4, thanks to Shane Volpe <shanevolpe AT gmail dot com>, bug #1338
Diffstat (limited to 'packages')
-rw-r--r-- | packages/php/php-5.0.5/autotools.patch | 90 | ||||
-rw-r--r-- | packages/php/php-5.0.5/endianness.patch | 10 | ||||
-rw-r--r-- | packages/php/php-5.1.4/.mtn2git_empty (renamed from packages/php/php-5.0.5/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/php/php-5.1.4/autotools.patch | 94 | ||||
-rw-r--r-- | packages/php/php_5.0.5.bb | 60 | ||||
-rw-r--r-- | packages/php/php_5.1.4.bb | 38 |
6 files changed, 132 insertions, 160 deletions
diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch deleted file mode 100644 index 7e466a425e..0000000000 --- a/packages/php/php-5.0.5/autotools.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4 ---- php-5.0.5~/acinclude.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/acinclude.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -781,10 +781,10 @@ - OVERALL_TARGET=[]ifelse($1,,php,$1) - php_c_pre='$(CC)' - php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' -- php_c_post=' && echo > $[@]' -+ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_cxx_pre='$(CXX)' - php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' -- php_cxx_post=' && echo > $[@]' -+ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' - php_lo=o - - case $with_pic in -@@ -1531,6 +1531,7 @@ - - dnl even newer glibcs have a different seeker definition... - -+ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, - AC_TRY_RUN([ - #define _GNU_SOURCE - #include <stdio.h> -@@ -1560,8 +1561,8 @@ - } - - ], -- [ cookie_io_functions_use_off64_t=yes ], -- [ ] ) -+ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ], -+ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) - - else - dnl older glibc versions (up to 2.1.2 ?) -diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in ---- php-5.0.5~/configure.in 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/configure.in 2005-10-10 19:56:55.000000000 -0700 -@@ -247,7 +247,7 @@ - sinclude(Zend/acinclude.m4) - sinclude(Zend/Zend.m4) - sinclude(TSRM/tsrm.m4) -- -+sinclude(TSRM/threads.m4) - - - divert(2) -diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4 ---- php-5.0.5~/scripts/phpize.m4 2005-10-10 19:56:46.000000000 -0700 -+++ php-5.0.5/scripts/phpize.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -1,7 +1,5 @@ - dnl This file becomes configure.in for self-contained extensions. - --AC_INIT(config.m4) -- - PHP_INIT_BUILD_SYSTEM - - AC_DEFUN([PHP_WITH_PHP_CONFIG],[ -@@ -55,8 +53,6 @@ - PHP_PROG_RE2C - AC_PROG_AWK - --sinclude(config.m4) -- - enable_static=no - enable_shared=yes - -diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4 ---- php-5.0.5~/TSRM/threads.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/threads.m4 2005-10-10 19:57:11.000000000 -0700 -@@ -86,7 +86,7 @@ - pthreads_working=no - ], [ - dnl For cross compiling running this test is of no use. NetWare supports pthreads -- pthreads_working=no -+ pthreads_working=yes - case $host_alias in - *netware*) - pthreads_working=yes -diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4 ---- php-5.0.5~/TSRM/tsrm.m4 2005-10-10 19:56:40.000000000 -0700 -+++ php-5.0.5/TSRM/tsrm.m4 2005-10-10 19:56:55.000000000 -0700 -@@ -68,7 +68,6 @@ - ]) - - sinclude(threads.m4) --sinclude(TSRM/threads.m4) - - AC_DEFUN([TSRM_CHECK_PTHREADS],[ - diff --git a/packages/php/php-5.0.5/endianness.patch b/packages/php/php-5.0.5/endianness.patch deleted file mode 100644 index 0231727c33..0000000000 --- a/packages/php/php-5.0.5/endianness.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- php-5.0.5/Zend/zend_strtod.c~ 2005-10-10 19:58:06.000000000 -0700 -+++ php-5.0.5/Zend/zend_strtod.c 2005-10-10 20:21:35.000000000 -0700 -@@ -130,6 +130,7 @@ - * but the word order is big endian. - */ - #define IEEE_BIG_ENDIAN -+#undef IEEE_LITTLE_ENDIAN - #endif - - #ifdef __vax__ diff --git a/packages/php/php-5.0.5/.mtn2git_empty b/packages/php/php-5.1.4/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/php/php-5.0.5/.mtn2git_empty +++ b/packages/php/php-5.1.4/.mtn2git_empty diff --git a/packages/php/php-5.1.4/autotools.patch b/packages/php/php-5.1.4/autotools.patch new file mode 100644 index 0000000000..d198c8e36d --- /dev/null +++ b/packages/php/php-5.1.4/autotools.patch @@ -0,0 +1,94 @@ +diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4 +--- php-5.1.4~/acinclude.m4 2006-04-10 08:17:36.000000000 -0400 ++++ php-5.1.4/acinclude.m4 2006-08-16 22:32:58.000000000 -0400 +@@ -818,10 +818,10 @@ + OVERALL_TARGET=[]ifelse($1,,php,$1) + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' + php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' +- php_c_post= ++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' + php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' +- php_cxx_post= ++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]' + php_lo=lo + + case $with_pic in +@@ -1670,6 +1670,7 @@ + have_fopen_cookie=yes + + dnl even newer glibcs have a different seeker definition... ++AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t, + AC_TRY_RUN([ + #define _GNU_SOURCE + #include <stdio.h> +@@ -1702,10 +1703,11 @@ + cookie_io_functions_use_off64_t=yes + ], [ + cookie_io_functions_use_off64_t=no +-], [ +- cookie_io_functions_use_off64_t=no +-]) +- ++], ++[ php_cv_lib_cookie_io_functions_use_off64_t=yes ], ++[ php_cv_lib_cookie_io_functions_use_off64_t=no ] )) ++ ++ + else + + dnl older glibc versions (up to 2.1.2 ?) +diff -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in +--- php-5.1.4~/configure.in 2006-05-03 19:30:02.000000000 -0400 ++++ php-5.1.4/configure.in 2006-08-16 20:39:19.000000000 -0400 +@@ -209,6 +209,7 @@ + + sinclude(Zend/Zend.m4) + sinclude(TSRM/tsrm.m4) ++sinclude(TSRM/threads.m4) + + + divert(2) +diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4 +--- php-5.1.4~/scripts/phpize.m4 2006-04-10 08:16:17.000000000 -0400 ++++ php-5.1.4/scripts/phpize.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -3,7 +3,6 @@ + divert(1) + + AC_PREREQ(2.13) +-AC_INIT(config.m4) + + PHP_CONFIG_NICE(config.nice) + +@@ -69,8 +68,6 @@ + PHP_PROG_RE2C + PHP_PROG_AWK + +-sinclude(config.m4) +- + enable_static=no + enable_shared=yes + +diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4 +--- php-5.1.4~/TSRM/threads.m4 2005-04-27 09:22:18.000000000 -0400 ++++ php-5.1.4/TSRM/threads.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -86,7 +86,7 @@ + pthreads_working=no + ], [ + dnl For cross compiling running this test is of no use. NetWare supports pthreads +- pthreads_working=no ++ pthreads_working=yes + case $host_alias in + *netware*) + pthreads_working=yes +diff -u'rNF^function' php-5.1.4~/TSRM/tsrm.m4 php-5.1.4/TSRM/tsrm.m4 +--- php-5.1.4~/TSRM/tsrm.m4 2005-05-29 19:16:40.000000000 -0400 ++++ php-5.1.4/TSRM/tsrm.m4 2006-08-16 20:39:19.000000000 -0400 +@@ -68,7 +68,6 @@ + ]) + + sinclude(threads.m4) +-sinclude(TSRM/threads.m4) + + AC_DEFUN([TSRM_CHECK_PTHREADS],[ + diff --git a/packages/php/php_5.0.5.bb b/packages/php/php_5.0.5.bb deleted file mode 100644 index b4b721f85e..0000000000 --- a/packages/php/php_5.0.5.bb +++ /dev/null @@ -1,60 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." -MAINTAINER = "Chris Larson <kergoth@handhelds.org>" -LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql" -SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \ - file://autotools.patch;patch=1 \ - file://endianness.patch;patch=1" -S = "${WORKDIR}/php-${PV}" - -inherit autotools - -CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" -EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ - --with-mysql=${STAGING_LIBDIR}/.. \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ - --without-libpng --without-libjpeg \ - --with-config-file-path=${sysconfdir}/php5 \ - --cache-file=config.cache \ - --disable-debug \ - --disable-rpath \ - --enable-bcmath \ - --enable-calendar \ - --enable-maintainer-zts \ - --enable-embed=shared \ - --enable-force-cgi-redirect \ - --enable-ftp \ - --enable-inline-optimization \ - --enable-magic-quotes \ - --enable-memory-limit \ - --enable-pic \ - --enable-safe-mode \ - --enable-sockets \ - --enable-track-vars \ - --enable-trans-sid \ - --enable-wddx \ - --sysconfdir=/etc/appWeb \ - --with-exec-dir=/etc/appWeb/exec \ - --with-db \ - --with-regex=system \ - --with-pear \ - --with-xml \ - --with-xmlrpc \ - --with-zlib \ - --without-iconv" - -EXTRA_OECONF += " --without-pear" -# Uncomment the following two lines, and comment the above to enable PEAR -#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" -#DEPENDS += " php-native" - -acpaths = "" - -do_configure_prepend() { - find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' -} - -do_install () { - oe_runmake 'INSTALL_ROOT=${D}' install -} diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb new file mode 100644 index 0000000000..fc982a678c --- /dev/null +++ b/packages/php/php_5.1.4.bb @@ -0,0 +1,38 @@ +SECTION = "console/network" +DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." +MAINTAINER = "Shane Volpe <shanevolpe@gmail.com>" +LICENSE = "PHP" +DEPENDS = "zlib libxml2 mysql libiconv" +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1" +S = "${WORKDIR}/php-${PV}" +PR = "r1" + +inherit autotools + +export THREADS="pthread" +export LIBS=" -lpthread " + +CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" +EXTRA_OECONF = "--without-iconv \ + --enable-discard-path \ + --enable-sockets \ + --enable-memory-limit \ + --enable-wddx \ + --with-zlib" + +EXTRA_OECONF += " --without-pear" +# Uncomment the following two lines, and comment the above to enable PEAR +#EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR}/php" +#DEPENDS += " php-native" + +acpaths = "" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' + find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + +do_install () { + oe_runmake 'INSTALL_ROOT=${D}' install +} |