From deab6e278888db06cd762f3b1db6fbaf1fb95fb4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sun, 20 Apr 2008 12:04:13 +0000 Subject: php: update 5.2.0 to the latest stable 5.2.5. I assume that bug 2866 is not yet fixed and php still broken. --- packages/php/php-native_5.2.0.bb | 11 ------- packages/php/php-native_5.2.5.bb | 11 +++++++ packages/php/php_5.2.0.bb | 65 ---------------------------------------- packages/php/php_5.2.5.bb | 65 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 76 deletions(-) delete mode 100644 packages/php/php-native_5.2.0.bb create mode 100644 packages/php/php-native_5.2.5.bb delete mode 100644 packages/php/php_5.2.0.bb create mode 100644 packages/php/php_5.2.5.bb (limited to 'packages/php') diff --git a/packages/php/php-native_5.2.0.bb b/packages/php/php-native_5.2.0.bb deleted file mode 100644 index b04103c90b..0000000000 --- a/packages/php/php-native_5.2.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -SECTION = "console/network" -require php_${PV}.bb -inherit autotools native pkgconfig -export LIBS=" -lxml2 " -export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" - -FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" -DEPENDS = "zlib-native libxml2-native" -PR = "r2" - -S = "${WORKDIR}/php-${PV}" diff --git a/packages/php/php-native_5.2.5.bb b/packages/php/php-native_5.2.5.bb new file mode 100644 index 0000000000..b04103c90b --- /dev/null +++ b/packages/php/php-native_5.2.5.bb @@ -0,0 +1,11 @@ +SECTION = "console/network" +require php_${PV}.bb +inherit autotools native pkgconfig +export LIBS=" -lxml2 " +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" + +FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" +DEPENDS = "zlib-native libxml2-native" +PR = "r2" + +S = "${WORKDIR}/php-${PV}" diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb deleted file mode 100644 index 890d467c10..0000000000 --- a/packages/php/php_5.2.0.bb +++ /dev/null @@ -1,65 +0,0 @@ -require php.inc - -PR = "r2" - -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}" - -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.5.bb b/packages/php/php_5.2.5.bb new file mode 100644 index 0000000000..890d467c10 --- /dev/null +++ b/packages/php/php_5.2.5.bb @@ -0,0 +1,65 @@ +require php.inc + +PR = "r2" + +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}" + +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