[arch-commits] Commit in php/trunk (PKGBUILD)
Pierre Schmitz
pierre at archlinux.org
Wed Mar 25 11:15:19 UTC 2009
Date: Wednesday, March 25, 2009 @ 07:15:19
Author: pierre
Revision: 31285
upgpkg: php 5.2.9-3
Modified:
php/trunk/PKGBUILD
----------+
PKGBUILD | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-25 10:58:53 UTC (rev 31284)
+++ PKGBUILD 2009-03-25 11:15:19 UTC (rev 31285)
@@ -3,7 +3,7 @@
pkgname=php
pkgver=5.2.9
-pkgrel=2
+pkgrel=3
_suhosinver=${pkgver}-0.9.7
pkgdesc='A high-level scripting language'
arch=('i686' 'x86_64')
@@ -132,10 +132,10 @@
cd ${srcdir}/${pkgname}-${pkgver}
# avoid linking against old db version
- patch -p0 -i ${srcdir}/db-configure.patch || return 1
+ patch -p0 -i ${srcdir}/db-configure.patch
# apply suhosin patch
- patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch || return 1
+ patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
# cli
./configure ${phpconfig} \
@@ -143,10 +143,10 @@
--with-readline \
--enable-pcntl \
--with-pear=/usr/share/pear \
- ${phpextensions} || return 1
- make || return 1
+ ${phpextensions}
+ make
# make test
- make INSTALL_ROOT=${pkgdir} install || return 1
+ make INSTALL_ROOT=${pkgdir} install
# cleanup
rm -f ${pkgdir}`${pkgdir}/usr/bin/php-config --extension-dir`/*.a
@@ -161,16 +161,16 @@
--enable-discard-path \
--enable-force-cgi-redirect \
--disable-cli \
- ${phpextensions} || return 1
- make || return 1
- install -D -m755 sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi || return 1
+ ${phpextensions}
+ make
+ install -D -m755 sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
# mod_php
./configure ${phpconfig} \
--with-apxs2 \
--disable-cli \
- ${phpextensions} || return 1
- make || return 1
- install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so || return 1
- install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf || return 1
+ ${phpextensions}
+ make
+ install -D -m644 libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
+ install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
}
More information about the arch-commits
mailing list