From 4710dde4a853a9acf2f2aa800cdbc748625b687c Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Sun, 17 Aug 2008 16:08:20 +0000 Subject: php: Update to version 5.2.6 *Replaced the old version 5.2.5 with 5.2.6 beginning with `MTN:' are removed automatically. MTN: MTN: Current branch: org.openembedded.dev MTN: Changes against parent 5154bfc13d743e02fb1148028acbd96c161e3234 MTN: dropped packages/php/php-5.2.5 MTN: dropped packages/php/php-5.2.5/acinclude-xml2-config.patch MTN: dropped packages/php/php-5.2.5/pear-makefile.patch MTN: dropped packages/php/php_5.2.5.bb MTN: added packages/php/php-5.2.6 MTN: added packages/php/php_5.2.6.bb MTN: ---------------------------------------------------------------------- MTN: --- packages/php/php-5.2.5/.mtn2git_empty | 0 packages/php/php-5.2.5/acinclude-xml2-config.patch | 18 ------ packages/php/php-5.2.5/pear-makefile.patch | 11 ---- packages/php/php-5.2.6/.mtn2git_empty | 0 packages/php/php_5.2.5.bb | 65 ---------------------- packages/php/php_5.2.6.bb | 65 ++++++++++++++++++++++ 6 files changed, 65 insertions(+), 94 deletions(-) delete mode 100644 packages/php/php-5.2.5/.mtn2git_empty delete mode 100644 packages/php/php-5.2.5/acinclude-xml2-config.patch delete mode 100644 packages/php/php-5.2.5/pear-makefile.patch create mode 100644 packages/php/php-5.2.6/.mtn2git_empty delete mode 100644 packages/php/php_5.2.5.bb create mode 100644 packages/php/php_5.2.6.bb (limited to 'packages/php') diff --git a/packages/php/php-5.2.5/.mtn2git_empty b/packages/php/php-5.2.5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/php/php-5.2.5/acinclude-xml2-config.patch b/packages/php/php-5.2.5/acinclude-xml2-config.patch deleted file mode 100644 index bf519d2934..0000000000 --- a/packages/php/php-5.2.5/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/packages/php/php-5.2.5/pear-makefile.patch b/packages/php/php-5.2.5/pear-makefile.patch deleted file mode 100644 index 26de98a48f..0000000000 --- a/packages/php/php-5.2.5/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/packages/php/php-5.2.6/.mtn2git_empty b/packages/php/php-5.2.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/php/php_5.2.5.bb b/packages/php/php_5.2.5.bb deleted file mode 100644 index a8dc83a444..0000000000 --- a/packages/php/php_5.2.5.bb +++ /dev/null @@ -1,65 +0,0 @@ -require php.inc - -PR = "r3" - -SRC_URI += "file://pear-makefile.patch;patch=1 " - -export THREADS="pthread" -export LIBS=" -lpthread " - -EXTRA_OECONF = " --without-iconv \ - --enable-discard-path \ - --enable-sockets \ - --enable-memory-limit \ - --enable-wddx \ - --enable-embedded-mysqli \ - --enable-magic-quotes \ - --with-zlib \ - --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ - --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ -" - -EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}" - -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" -export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" -export PHP_PEAR_PHP_BIN="/usr/bin/php" - -do_configure_append() { - find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' -} - -PACKAGES = "${PN}-dbg \ - ${PN}-cli \ - ${PN}-pear \ - ${PN}-dev \ - ${PN} \ -" - - -FILES_${PN}-dbg =+"/usr/bin/.debug" - -FILES_${PN}-cli ="/usr/bin/php" - -FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ - /usr/lib/php/PEAR \ - /usr/lib/php/PEAR.php \ - /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \ - /usr/lib/php/.channels /usr/lib/php/.channels/.alias \ - /usr/lib/php/.channels\__uri.reg \ - /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \ - /usr/lib/php/.registry \ - /usr/lib/php/Archive/Tar.php \ - /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \ - /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \ - /usr/lib/php/.lock" - -FILES_${PN}-dev ="/usr/include/php /usr/include/build \ - /usr/bin/phpize /usr/bin/php-config" - -FILES_${PN} ="/usr/lib/php" -FILES_${PN} +="/usr/bin" - -RDEPENDS_${PN}-pear =${PN} -RDEPENDS_${PN}-cli =${PN} -RDEPENDS_${PN}-dev =${PN} diff --git a/packages/php/php_5.2.6.bb b/packages/php/php_5.2.6.bb new file mode 100644 index 0000000000..6281cfe04e --- /dev/null +++ b/packages/php/php_5.2.6.bb @@ -0,0 +1,65 @@ +require php.inc + +PR = "r1" + +SRC_URI += "file://pear-makefile.patch;patch=1 " + +export THREADS="pthread" +export LIBS=" -lpthread " + +EXTRA_OECONF = " --without-iconv \ + --enable-discard-path \ + --enable-sockets \ + --enable-memory-limit \ + --enable-wddx \ + --enable-embedded-mysqli \ + --enable-magic-quotes \ + --with-zlib \ + --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \ + --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ +" + +EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR} --with-libxml-dir=${STAGING_BINDIR_CROSS}" + +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" +export PHP_NATIVE_DIR="${STAGING_BINDIR_NATIVE}" +export PHP_PEAR_PHP_BIN="/usr/bin/php" + +do_configure_append() { + find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' +} + +PACKAGES = "${PN}-dbg \ + ${PN}-cli \ + ${PN}-pear \ + ${PN}-dev \ + ${PN} \ +" + + +FILES_${PN}-dbg =+"/usr/bin/.debug" + +FILES_${PN}-cli ="/usr/bin/php" + +FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ + /usr/lib/php/PEAR \ + /usr/lib/php/PEAR.php \ + /usr/lib/php/System.php /usr/lib/php/peclcmd.php /usr/lib/php/pearcmd.php \ + /usr/lib/php/.channels /usr/lib/php/.channels/.alias \ + /usr/lib/php/.channels\__uri.reg \ + /usr/lib/php/.channels\pear.php.net.reg /usr/lib/php/.channels/pecl.php.net.reg \ + /usr/lib/php/.registry \ + /usr/lib/php/Archive/Tar.php \ + /usr/lib/php/Console/Getopt.php /usr/lib/php/OS/Guess.php \ + /usr/lib/php/.depdb /usr/lib/php/.depdblock /usr/lib/php/.filemap \ + /usr/lib/php/.lock" + +FILES_${PN}-dev ="/usr/include/php /usr/include/build \ + /usr/bin/phpize /usr/bin/php-config" + +FILES_${PN} ="/usr/lib/php" +FILES_${PN} +="/usr/bin" + +RDEPENDS_${PN}-pear =${PN} +RDEPENDS_${PN}-cli =${PN} +RDEPENDS_${PN}-dev =${PN} -- cgit v1.2.3