[arch-commits] Commit in php/trunk (PKGBUILD generate_patches)
Pierre Schmitz
pierre at archlinux.org
Sat Jan 16 12:40:35 UTC 2021
Date: Saturday, January 16, 2021 @ 12:40:35
Author: pierre
Revision: 406292
Quote paths
Modified:
php/trunk/PKGBUILD
php/trunk/generate_patches
------------------+
PKGBUILD | 94 ++++++++++++++++++++++++++---------------------------
generate_patches | 2 -
2 files changed, 48 insertions(+), 48 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-16 12:30:19 UTC (rev 406291)
+++ PKGBUILD 2021-01-16 12:40:35 UTC (rev 406292)
@@ -42,11 +42,11 @@
'BFDDD28642824F8118EF77909B67A5C12229118F')
prepare() {
- cd ${srcdir}/${pkgbase}-${pkgver}
+ cd "${srcdir}/${pkgbase}-${pkgver}"
- patch -p0 -i ${srcdir}/apache.patch
- patch -p0 -i ${srcdir}/php-fpm.patch
- patch -p0 -i ${srcdir}/php.ini.patch
+ patch -p0 -i "${srcdir}/apache.patch"
+ patch -p0 -i "${srcdir}/php-fpm.patch"
+ patch -p0 -i "${srcdir}/php.ini.patch"
autoconf
# Disable failing tests
@@ -126,9 +126,9 @@
EXTENSION_DIR=/usr/lib/php/modules
export EXTENSION_DIR
- mkdir ${srcdir}/build
- cd ${srcdir}/build
- ln -s ../${pkgbase}-${pkgver}/configure
+ mkdir "${srcdir}/build"
+ cd "${srcdir}/build"
+ ln -s "../${pkgbase}-${pkgver}/configure"
./configure ${_phpconfig} \
--enable-cgi \
--enable-fpm \
@@ -142,8 +142,8 @@
# apache
# reuse the previous run; this will save us a lot of time
- cp -a ${srcdir}/build ${srcdir}/build-apache
- cd ${srcdir}/build-apache
+ cp -a "${srcdir}/build" "${srcdir}/build-apache"
+ cd "${srcdir}/build-apache"
./configure ${_phpconfig} \
--with-apxs2 \
${_phpextensions}
@@ -150,8 +150,8 @@
make
# phpdbg
- cp -a ${srcdir}/build ${srcdir}/build-phpdbg
- cd ${srcdir}/build-phpdbg
+ cp -a "${srcdir}/build" "${srcdir}/build-phpdbg"
+ cd "${srcdir}/build-phpdbg"
./configure ${_phpconfig} \
--enable-phpdbg \
${_phpextensions}
@@ -159,7 +159,7 @@
}
check() {
- cd ${srcdir}/build
+ cd "${srcdir}/build"
# Check if sendmail was configured correctly (FS#47600)
sapi/cli/php -n -r 'echo ini_get("sendmail_path");' | grep -q '/usr/bin/sendmail'
@@ -182,17 +182,17 @@
provides=("php-ldap=${pkgver}")
backup=('etc/php/php.ini')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} install-{modules,cli,build,headers,programs,pharcmd}
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
- install -d -m755 ${pkgdir}/etc/php/conf.d/
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-{modules,cli,build,headers,programs,pharcmd}
+ install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/php.ini-production" "${pkgdir}/etc/php/php.ini"
+ install -d -m755 "${pkgdir}/etc/php/conf.d/"
# remove static modules
- rm -f ${pkgdir}/usr/lib/php/modules/*.a
+ rm -f "${pkgdir}/usr/lib/php/modules/"*.a
# remove modules provided by sub packages
- rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
+ rm -f "${pkgdir}/usr/lib/php/modules/"{enchant,gd,imap,intl,sodium,odbc,pdo_dblib,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
# remove empty directory
- rmdir ${pkgdir}/usr/include/php/include
+ rmdir "${pkgdir}/usr/include/php/include"
}
package_php-cgi() {
@@ -199,8 +199,8 @@
pkgdesc='CGI and FCGI SAPI for PHP'
depends=('php')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} install-cgi
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-cgi
}
package_php-apache() {
@@ -208,8 +208,8 @@
depends=('php' 'apache' 'libnsl')
backup=('etc/httpd/conf/extra/php_module.conf')
- install -D -m755 ${srcdir}/build-apache/libs/libphp.so ${pkgdir}/usr/lib/httpd/modules/libphp.so
- install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php_module.conf
+ install -D -m755 "${srcdir}/build-apache/libs/libphp.so" "${pkgdir}/usr/lib/httpd/modules/libphp.so"
+ install -D -m644 "${srcdir}/apache.conf" "${pkgdir}/etc/httpd/conf/extra/php_module.conf"
}
package_php-fpm() {
@@ -218,10 +218,10 @@
backup=('etc/php/php-fpm.conf' 'etc/php/php-fpm.d/www.conf')
options=('!emptydirs')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} install-fpm
- install -D -m644 sapi/fpm/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
- install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-fpm
+ install -D -m644 sapi/fpm/php-fpm.service "${pkgdir}/usr/lib/systemd/system/php-fpm.service"
+ install -D -m644 "${srcdir}/php-fpm.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf"
}
package_php-embed() {
@@ -229,8 +229,8 @@
depends=('php' 'systemd-libs' 'libnsl' 'libxcrypt')
options=('!emptydirs')
- cd ${srcdir}/build
- make -j1 INSTALL_ROOT=${pkgdir} PHP_SAPI=embed install-sapi
+ cd "${srcdir}/build"
+ make -j1 INSTALL_ROOT="${pkgdir}" PHP_SAPI=embed install-sapi
}
package_php-phpdbg() {
@@ -238,8 +238,8 @@
depends=('php')
options=('!emptydirs')
- cd ${srcdir}/build-phpdbg
- make -j1 INSTALL_ROOT=${pkgdir} install-phpdbg
+ cd "${srcdir}/build-phpdbg"
+ make -j1 INSTALL_ROOT="${pkgdir}" install-phpdbg
}
package_php-dblib() {
@@ -246,7 +246,7 @@
pkgdesc='dblib module for PHP'
depends=('php' 'freetds')
- install -D -m755 ${srcdir}/build/modules/pdo_dblib.so ${pkgdir}/usr/lib/php/modules/pdo_dblib.so
+ install -D -m755 "${srcdir}/build/modules/pdo_dblib.so" "${pkgdir}/usr/lib/php/modules/pdo_dblib.so"
}
package_php-enchant() {
@@ -253,7 +253,7 @@
pkgdesc='enchant module for PHP'
depends=('php' 'enchant')
- install -D -m755 ${srcdir}/build/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
+ install -D -m755 "${srcdir}/build/modules/enchant.so" "${pkgdir}/usr/lib/php/modules/enchant.so"
}
package_php-gd() {
@@ -260,7 +260,7 @@
pkgdesc='gd module for PHP'
depends=('php' 'gd')
- install -D -m755 ${srcdir}/build/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
+ install -D -m755 "${srcdir}/build/modules/gd.so" "${pkgdir}/usr/lib/php/modules/gd.so"
}
package_php-imap() {
@@ -267,7 +267,7 @@
pkgdesc='imap module for PHP'
depends=('php' 'c-client' 'libxcrypt')
- install -D -m755 ${srcdir}/build/modules/imap.so ${pkgdir}/usr/lib/php/modules/imap.so
+ install -D -m755 "${srcdir}/build/modules/imap.so" "${pkgdir}/usr/lib/php/modules/imap.so"
}
package_php-intl() {
@@ -274,7 +274,7 @@
pkgdesc='intl module for PHP'
depends=('php' 'icu')
- install -D -m755 ${srcdir}/build/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
+ install -D -m755 "${srcdir}/build/modules/intl.so" "${pkgdir}/usr/lib/php/modules/intl.so"
}
package_php-sodium() {
@@ -281,7 +281,7 @@
pkgdesc='sodium module for PHP'
depends=('php' 'libsodium')
- install -D -m755 ${srcdir}/build/modules/sodium.so ${pkgdir}/usr/lib/php/modules/sodium.so
+ install -D -m755 "${srcdir}/build/modules/sodium.so" "${pkgdir}/usr/lib/php/modules/sodium.so"
}
package_php-odbc() {
@@ -288,8 +288,8 @@
pkgdesc='ODBC modules for PHP'
depends=('php' 'unixodbc')
- install -D -m755 ${srcdir}/build/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
- install -D -m755 ${srcdir}/build/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
+ install -D -m755 "${srcdir}/build/modules/odbc.so" "${pkgdir}/usr/lib/php/modules/odbc.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_odbc.so" "${pkgdir}/usr/lib/php/modules/pdo_odbc.so"
}
package_php-pgsql() {
@@ -296,8 +296,8 @@
pkgdesc='PostgreSQL modules for PHP'
depends=('php' 'postgresql-libs')
- install -D -m755 ${srcdir}/build/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
- install -D -m755 ${srcdir}/build/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
+ install -D -m755 "${srcdir}/build/modules/pgsql.so" "${pkgdir}/usr/lib/php/modules/pgsql.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_pgsql.so" "${pkgdir}/usr/lib/php/modules/pdo_pgsql.so"
}
package_php-pspell() {
@@ -304,7 +304,7 @@
pkgdesc='pspell module for PHP'
depends=('php' 'aspell')
- install -D -m755 ${srcdir}/build/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
+ install -D -m755 "${srcdir}/build/modules/pspell.so" "${pkgdir}/usr/lib/php/modules/pspell.so"
}
package_php-snmp() {
@@ -311,7 +311,7 @@
pkgdesc='snmp module for PHP'
depends=('php' 'net-snmp')
- install -D -m755 ${srcdir}/build/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
+ install -D -m755 "${srcdir}/build/modules/snmp.so" "${pkgdir}/usr/lib/php/modules/snmp.so"
}
package_php-sqlite() {
@@ -318,8 +318,8 @@
pkgdesc='sqlite module for PHP'
depends=('php' 'sqlite')
- install -D -m755 ${srcdir}/build/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
- install -D -m755 ${srcdir}/build/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
+ install -D -m755 "${srcdir}/build/modules/sqlite3.so" "${pkgdir}/usr/lib/php/modules/sqlite3.so"
+ install -D -m755 "${srcdir}/build/modules/pdo_sqlite.so" "${pkgdir}/usr/lib/php/modules/pdo_sqlite.so"
}
package_php-tidy() {
@@ -326,7 +326,7 @@
pkgdesc='tidy module for PHP'
depends=('php' 'tidy')
- install -D -m755 ${srcdir}/build/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
+ install -D -m755 "${srcdir}/build/modules/tidy.so" "${pkgdir}/usr/lib/php/modules/tidy.so"
}
package_php-xsl() {
@@ -333,5 +333,5 @@
pkgdesc='xsl module for PHP'
depends=('php' 'libxslt')
- install -D -m755 ${srcdir}/build/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
+ install -D -m755 "${srcdir}/build/modules/xsl.so" "${pkgdir}/usr/lib/php/modules/xsl.so"
}
Modified: generate_patches
===================================================================
--- generate_patches 2021-01-16 12:30:19 UTC (rev 406291)
+++ generate_patches 2021-01-16 12:40:35 UTC (rev 406292)
@@ -4,7 +4,7 @@
makepkg -o --nodeps --noprepare --skipinteg
-pushd src/${pkgbase}-${pkgver}
+pushd "src/${pkgbase}-${pkgver}"
sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
More information about the arch-commits
mailing list