[arch-commits] Commit in php/trunk (PKGBUILD)

Pierre Schmitz pierre at archlinux.org
Tue Jul 6 04:59:47 EDT 2010


    Date: Tuesday, July 6, 2010 @ 04:59:46
  Author: pierre
Revision: 85002

cleanup
fix FS#20088

Modified:
  php/trunk/PKGBUILD

----------+
 PKGBUILD |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-06 07:49:27 UTC (rev 85001)
+++ PKGBUILD	2010-07-06 08:59:46 UTC (rev 85002)
@@ -137,17 +137,17 @@
 	cd ${srcdir}/${pkgbase}-${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
 
 	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch || return 1
+	patch -p0 -i ${srcdir}/php.ini.patch
 
 	# fix http://bugs.php.net/51242
 	# remove for next upstream release
-	patch -p0 -i ${srcdir}/mysqlnd_default_port.patch || return 1
+	patch -p0 -i ${srcdir}/mysqlnd_default_port.patch
 
 	# php
 	mkdir ${srcdir}/build-php
@@ -157,8 +157,8 @@
 		--disable-cgi \
 		--with-readline \
 		--enable-pcntl \
-		${phpextensions} || return 1
-	make || return 1
+		${phpextensions}
+	make
 
 	# cgi and fcgi
 	# reuse the previous run; this will save us a lot of time
@@ -167,8 +167,8 @@
 	./configure ${phpconfig} \
 		--enable-cgi \
 		--disable-cli \
-		${phpextensions} || return 1
-	make || return 1
+		${phpextensions}
+	make
 
 	# apache
 	cp -a ${srcdir}/build-php ${srcdir}/build-apache
@@ -176,8 +176,8 @@
 	./configure ${phpconfig} \
 		--with-apxs2 \
 		--disable-cli \
-		${phpextensions} || return 1
-	make || return 1
+		${phpextensions}
+	make
 
 	# embed
 	cp -a ${srcdir}/build-php ${srcdir}/build-embed
@@ -185,8 +185,8 @@
 	./configure ${phpconfig} \
 		--enable-embed=shared \
 		--disable-cli \
-		${phpextensions} || return 1
-	make || return 1
+		${phpextensions}
+	make
 
 	# pear
 	cp -a ${srcdir}/build-php ${srcdir}/build-pear
@@ -196,8 +196,8 @@
 		--with-readline \
 		--enable-pcntl \
 		--with-pear \
-		${phpextensions} || return 1
-	make || return 1
+		${phpextensions}
+	make
 }
 
 package_php() {
@@ -209,7 +209,7 @@
 	backup=('etc/php/php.ini')
 
 	cd ${srcdir}/build-php
-	make INSTALL_ROOT=${pkgdir} install || return 1
+	make INSTALL_ROOT=${pkgdir} install
 	install -d -m755 ${pkgdir}/usr/share/pear
 	# fix broken link
 	ln -sf phar.phar $pkgdir/usr/bin/phar
@@ -254,9 +254,10 @@
 
 	cd ${srcdir}/build-pear
 	make install-pear INSTALL_ROOT=${pkgdir}
-	for i in $(find ${pkgdir}/ -name '.*'); do
-		[ -e $i ] && rm -rf $i
-	done
+	local i
+	while read i; do
+		[ ! -e "$i" ] || rm -rf "$i"
+	done < <(find ${pkgdir} -name '.*')
 }
 
 package_php-curl() {



More information about the arch-commits mailing list