diff options
| -rw-r--r-- | packages/php/php-native_4.4.4.bb | 1 | ||||
| -rw-r--r-- | packages/php/php-native_5.2.0.bb | 2 | ||||
| -rw-r--r-- | packages/php/php.inc | 8 | ||||
| -rw-r--r-- | packages/php/php_4.4.4.bb | 2 | ||||
| -rw-r--r-- | packages/php/php_5.1.4.bb | 19 | ||||
| -rw-r--r-- | packages/php/php_5.2.0.bb | 33 |
6 files changed, 14 insertions, 51 deletions
diff --git a/packages/php/php-native_4.4.4.bb b/packages/php/php-native_4.4.4.bb index c90aa83c01..07b13be93a 100644 --- a/packages/php/php-native_4.4.4.bb +++ b/packages/php/php-native_4.4.4.bb @@ -3,3 +3,4 @@ require php_${PV}.bb inherit native FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native" +PR = "r1" diff --git a/packages/php/php-native_5.2.0.bb b/packages/php/php-native_5.2.0.bb index 7f5bc9fd94..b3bf7b56b4 100644 --- a/packages/php/php-native_5.2.0.bb +++ b/packages/php/php-native_5.2.0.bb @@ -6,4 +6,4 @@ export LD_LIBRARY_PATH = "${STAGING_LIBDIR}" FILESPATH = "${FILE_DIRNAME}/php-${PV}:${FILE_DIRNAME}/php:${FILE_DIRNAME}/files" DEPENDS = "zlib-native libxml2-native" - +PR = "r1" diff --git a/packages/php/php.inc b/packages/php/php.inc index 33219d86c9..321034bee7 100644 --- a/packages/php/php.inc +++ b/packages/php/php.inc @@ -2,9 +2,11 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package pro HOMEPAGE = "http://www.php.net" SECTION = "console/network" LICENSE = "PHP" -SRC_URI = "http://de3.php.net/distributions/php-${PV}.tar.bz2 \ - file://${FILESDIR}/autotools.patch;patch=1 \ - file://${FILESDIR}/pear.patch;patch=1" +DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native" + +SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ + file://autotools.patch;patch=1 \ + file://acinclude-xml2-config.patch;patch=1" inherit autotools diff --git a/packages/php/php_4.4.4.bb b/packages/php/php_4.4.4.bb index 356b45d4cd..3000ad1fb6 100644 --- a/packages/php/php_4.4.4.bb +++ b/packages/php/php_4.4.4.bb @@ -1,5 +1,7 @@ require php.inc +PR = "r1" + SRC_URI = "http://museum.php.net/php4/php-${PV}.tar.bz2 \ file://${FILESDIR}/autotools.patch;patch=1 \ file://${FILESDIR}/pear.patch;patch=1" diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb index a9ea9d2ed6..47475daca9 100644 --- a/packages/php/php_5.1.4.bb +++ b/packages/php/php_5.1.4.bb @@ -1,21 +1,12 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." -LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql virtual/libiconv" +require php.inc -SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ - file://autotools.patch;patch=1 \ - file://acinclude-xml2-config.patch;patch=1" - -S = "${WORKDIR}/php-${PV}" -PR = "r2" +PR = "r3" inherit autotools export THREADS="pthread" export LIBS=" -lpthread " -CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" EXTRA_OECONF = "--without-iconv \ --enable-discard-path \ --enable-sockets \ @@ -28,13 +19,7 @@ EXTRA_OECONF += " --without-pear --with-libxml-dir=${STAGING_BINDIR} " #EXTRA_OECONF += " --with-pear-php-cli=${STAGING_BINDIR_NATIVE}/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 -} diff --git a/packages/php/php_5.2.0.bb b/packages/php/php_5.2.0.bb index ea4b0eaf7c..4ed88cf411 100644 --- a/packages/php/php_5.2.0.bb +++ b/packages/php/php_5.2.0.bb @@ -1,22 +1,12 @@ -SECTION = "console/network" -DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." -LICENSE = "PHP" -DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native" +require php.inc -SRC_URI = "http://us2.php.net/distributions/php-${PV}.tar.bz2\ - file://autotools.patch;patch=1 \ - file://acinclude-xml2-config.patch;patch=1 \ - file://pear-makefile.patch;patch=1 \ - " -S = "${WORKDIR}/php-${PV}" -PR = "r1" +PR = "r2" -inherit autotools +SRC_URI += "file://pear-makefile.patch;patch=1 " export THREADS="pthread" export LIBS=" -lpthread " -CFLAGS += " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" EXTRA_OECONF = " --without-iconv \ --enable-discard-path \ --enable-sockets \ @@ -29,28 +19,16 @@ EXTRA_OECONF = " --without-iconv \ --with-mysqli="${STAGING_BINDIR_NATIVE}/mysql_config" \ " - - - -# Uncomment the following two lines, and comment the above to enable PEAR 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" -acpaths = "" - do_configure_append() { find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' } -do_install () { - oe_runmake 'INSTALL_ROOT=${D}' install -} - - - PACKAGES = "${PN}-dbg \ ${PN}-cli \ ${PN}-pear \ @@ -76,17 +54,12 @@ FILES_${PN}-pear ="/usr/bin/pear* /usr/bin/pecl \ /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} - - |