diff options
author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-14 12:09:39 +0200 |
---|---|---|
committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-14 12:09:39 +0200 |
commit | 77090290235ba10b46520a88bf2e971af90b04aa (patch) | |
tree | 3733e230a8fe2cc2c2d6446788085e42abc732a4 /recipes | |
parent | c369557680823f6309afb9d0cd1914e946e27424 (diff) |
php: removed some old versions
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/php/php-5.2.6/acinclude-xml2-config.patch | 18 | ||||
-rw-r--r-- | recipes/php/php-5.2.6/pear-makefile.patch | 11 | ||||
-rw-r--r-- | recipes/php/php-5.2.6/php-m4-divert.patch | 83 | ||||
-rw-r--r-- | recipes/php/php-5.2.6/string.c.patch | 21 | ||||
-rw-r--r-- | recipes/php/php-5.3.0/acinclude-xml2-config.patch | 18 | ||||
-rw-r--r-- | recipes/php/php-5.3.0/pear-makefile.patch | 11 | ||||
-rw-r--r-- | recipes/php/php-5.3.0/php-m4-divert.patch | 83 | ||||
-rw-r--r-- | recipes/php/php-native_5.2.6.bb | 6 | ||||
-rw-r--r-- | recipes/php/php-native_5.3.0.bb | 6 | ||||
-rw-r--r-- | recipes/php/php_5.2.6.bb | 90 |
10 files changed, 0 insertions, 347 deletions
diff --git a/recipes/php/php-5.2.6/acinclude-xml2-config.patch b/recipes/php/php-5.2.6/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/recipes/php/php-5.2.6/acinclude-xml2-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 -@@ -2359,12 +2359,9 @@ - AC_DEFUN([PHP_SETUP_LIBXML], [ - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" -+ - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.2.6/pear-makefile.patch b/recipes/php/php-5.2.6/pear-makefile.patch deleted file mode 100644 index 26de98a48f..0000000000 --- a/recipes/php/php-5.2.6/pear-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 -+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 -@@ -6,7 +6,7 @@ - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php-5.2.6/php-m4-divert.patch b/recipes/php/php-5.2.6/php-m4-divert.patch deleted file mode 100644 index dfc7b643e2..0000000000 --- a/recipes/php/php-5.2.6/php-m4-divert.patch +++ /dev/null @@ -1,83 +0,0 @@ -Patch taken from - -http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 - -diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in ---- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 -+++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 -@@ -1,7 +1,7 @@ - ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- - dnl ## Process this file with autoconf to produce a configure script. - --divert(1) -+divert(1001) - - dnl ## Diversion 1 is the autoconf + automake setup phase. We also - dnl ## set the PHP version, deal with platform-specific compile -@@ -263,7 +263,7 @@ - sinclude(TSRM/tsrm.m4) - - --divert(2) -+divert(1002) - - dnl ## Diversion 2 is where we set PHP-specific options and come up - dnl ## with reasonable default values for them. We check for pthreads here -@@ -302,7 +302,7 @@ - PTHREADS_FLAGS - fi - --divert(3) -+divert(1003) - - dnl ## In diversion 3 we check for compile-time options to the PHP - dnl ## core and how to deal with different system dependencies. -@@ -661,7 +661,7 @@ - PHP_CRYPT_R_STYLE - fi - --divert(4) -+divert(1004) - - dnl ## In diversion 4 we check user-configurable general settings. - -@@ -902,7 +902,7 @@ - AC_MSG_RESULT([using system default]) - fi - --divert(5) -+divert(1005) - - dnl ## In diversion 5 we check which extensions should be compiled. - dnl ## All of these are normally in the extension directories. -diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 ---- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 -+++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -205,7 +205,7 @@ - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check for regex library type -diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 ---- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 -+++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) diff --git a/recipes/php/php-5.2.6/string.c.patch b/recipes/php/php-5.2.6/string.c.patch deleted file mode 100644 index a24b887ac2..0000000000 --- a/recipes/php/php-5.2.6/string.c.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: php-5.2.6/ext/standard/string.c -=================================================================== ---- php-5.2.6.orig/ext/standard/string.c -+++ php-5.2.6/ext/standard/string.c -@@ -592,14 +592,12 @@ PHP_FUNCTION(nl_langinfo) - #endif - #ifdef DECIMAL_POINT - case DECIMAL_POINT: --#endif --#ifdef RADIXCHAR -+#elif RADIXCHAR - case RADIXCHAR: - #endif - #ifdef THOUSANDS_SEP - case THOUSANDS_SEP: --#endif --#ifdef THOUSEP -+#elif THOUSEP - case THOUSEP: - #endif - #ifdef GROUPING diff --git a/recipes/php/php-5.3.0/acinclude-xml2-config.patch b/recipes/php/php-5.3.0/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/recipes/php/php-5.3.0/acinclude-xml2-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 -@@ -2359,12 +2359,9 @@ - AC_DEFUN([PHP_SETUP_LIBXML], [ - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, - [ -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" -+ - ]) - - if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/recipes/php/php-5.3.0/pear-makefile.patch b/recipes/php/php-5.3.0/pear-makefile.patch deleted file mode 100644 index 26de98a48f..0000000000 --- a/recipes/php/php-5.3.0/pear-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 -+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 -@@ -6,7 +6,7 @@ - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 - - install-pear-installer: $(SAPI_CLI_PATH) -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/recipes/php/php-5.3.0/php-m4-divert.patch b/recipes/php/php-5.3.0/php-m4-divert.patch deleted file mode 100644 index dfc7b643e2..0000000000 --- a/recipes/php/php-5.3.0/php-m4-divert.patch +++ /dev/null @@ -1,83 +0,0 @@ -Patch taken from - -http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1 - -diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in ---- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200 -+++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200 -@@ -1,7 +1,7 @@ - ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- - dnl ## Process this file with autoconf to produce a configure script. - --divert(1) -+divert(1001) - - dnl ## Diversion 1 is the autoconf + automake setup phase. We also - dnl ## set the PHP version, deal with platform-specific compile -@@ -263,7 +263,7 @@ - sinclude(TSRM/tsrm.m4) - - --divert(2) -+divert(1002) - - dnl ## Diversion 2 is where we set PHP-specific options and come up - dnl ## with reasonable default values for them. We check for pthreads here -@@ -302,7 +302,7 @@ - PTHREADS_FLAGS - fi - --divert(3) -+divert(1003) - - dnl ## In diversion 3 we check for compile-time options to the PHP - dnl ## core and how to deal with different system dependencies. -@@ -661,7 +661,7 @@ - PHP_CRYPT_R_STYLE - fi - --divert(4) -+divert(1004) - - dnl ## In diversion 4 we check user-configurable general settings. - -@@ -902,7 +902,7 @@ - AC_MSG_RESULT([using system default]) - fi - --divert(5) -+divert(1005) - - dnl ## In diversion 5 we check which extensions should be compiled. - dnl ## All of these are normally in the extension directories. -diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4 ---- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200 -+++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200 -@@ -1,6 +1,6 @@ - dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- - --divert(3)dnl -+divert(1003)dnl - - dnl - dnl Check if flush should be called explicitly after buffered io -@@ -205,7 +205,7 @@ - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) - AC_FUNC_FNMATCH - --divert(5)dnl -+divert(1005)dnl - - dnl - dnl Check for regex library type -diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4 ---- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200 -+++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200 -@@ -1,6 +1,6 @@ - dnl This file becomes configure.in for self-contained extensions. - --divert(1) -+divert(1001) - - AC_PREREQ(2.13) - AC_INIT(config.m4) diff --git a/recipes/php/php-native_5.2.6.bb b/recipes/php/php-native_5.2.6.bb deleted file mode 100644 index 01374d02aa..0000000000 --- a/recipes/php/php-native_5.2.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require php-native.inc - -PR = "r3" - -SRC_URI[src.md5sum] = "7380ffecebd95c6edb317ef861229ebd" -SRC_URI[src.sha256sum] = "1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81" diff --git a/recipes/php/php-native_5.3.0.bb b/recipes/php/php-native_5.3.0.bb deleted file mode 100644 index d8f41a6d19..0000000000 --- a/recipes/php/php-native_5.3.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -require php-native.inc - -PR = "r3" - -SRC_URI[src.md5sum] = "846760cd655c98dfd86d6d97c3d964b0" -SRC_URI[src.sha256sum] = "83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357" diff --git a/recipes/php/php_5.2.6.bb b/recipes/php/php_5.2.6.bb deleted file mode 100644 index 3b011ab1ac..0000000000 --- a/recipes/php/php_5.2.6.bb +++ /dev/null @@ -1,90 +0,0 @@ -require php.inc - -DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql" - -PR = "r7" - -SRC_URI += "file://pear-makefile.patch \ - file://string.c.patch " - -export THREADS="pthread" -export LIBS=" -lpthread " - -EXTRA_OECONF = " --without-iconv \ - --enable-discard-path \ - --enable-sockets \ - --enable-shared \ -# --enable-pcntl \ - --enable-memory-limit \ - --enable-wddx \ - --enable-embedded-mysqli \ - --enable-magic-quotes \ - --enable-fastcgi \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ - --with-libxml-dir=${STAGING_BINDIR_CROSS} \ - --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ -# --with-mysqli = "${STAGING_BINDIR_NATIVE}/mysql_config" \ - --without-pdo-sqlite \ - " - -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN = "${bindir}/php" - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' -} - -# fixme -do_install_append() { - mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir} - rm -rf ${D}/${STAGING_DIR_NATIVE} - rm -rf ${D}/.registry - rm -rf ${D}/.channels - rm -rf ${D}/.[a-z]* -} - -PACKAGES = "${PN}-dbg \ - ${PN}-cli \ - ${PN}-cgi \ - ${PN}-pear \ - ${PN}-dev \ - ${PN}-doc \ - ${PN} \ -" - - -FILES_${PN}-dbg =+ "${bindir}/.debug" - -FILES_${PN}-doc += "${libdir}/php/doc" - -FILES_${PN}-cli = "${bindir}/php" -FILES_${PN}-cgi = "${bindir}/php-cgi" - -FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \ - ${libdir}/php/PEAR \ - ${libdir}/php/PEAR.php \ - ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \ - ${libdir}/php/.channels ${libdir}/php/.channels/.alias \ - ${libdir}/php/.channels\__uri.reg \ - ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \ - ${libdir}/php/.registry \ - ${libdir}/php/Archive/Tar.php \ - ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \ - ${sysconfdir}/pear.conf" - - -FILES_${PN}-dev = "${includedir}/php ${libdir}/build \ - ${bindir}/phpize ${bindir}/php-config \ - ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \ - ${libdir}/php/test " - -FILES_${PN} = "${libdir}/php" -FILES_${PN} += "${bindir}" - -RDEPENDS_${PN}-pear = ${PN} -RDEPENDS_${PN}-cli = ${PN} -RDEPENDS_${PN}-dev = ${PN} - -SRC_URI[src.md5sum] = "7380ffecebd95c6edb317ef861229ebd" -SRC_URI[src.sha256sum] = "1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81" |