summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMickaël Thomas2016-03-31 19:21:28 +0200
committerMickaël Thomas2016-03-31 19:29:05 +0200
commitf5d018c5873f83f8456c4c4cdc12f73e2694b7e6 (patch)
treeb570d7df90bf498c929773c565f1ed737d191e8b
parenta87e7971b384bace69771b6c75f66b0772646dd9 (diff)
downloadaur-f5d018c5873f83f8456c4c4cdc12f73e2694b7e6.tar.gz
Fix some pear/pecl packaging issues
-rw-r--r--PKGBUILD10
1 files changed, 3 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index fcfe96eef85..eefcedee059 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -30,7 +30,7 @@ pkgname=("${pkgbase}"
"${pkgbase}-tidy"
"${pkgbase}-xsl")
pkgver=5.6.19
-pkgrel=1
+pkgrel=2
pkgdesc="A general-purpose scripting language that is especially suited to web development"
arch=('i686' 'x86_64')
license=('PHP')
@@ -212,6 +212,7 @@ build() {
make
# pear
+ sed -i 's#@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d#@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -p $(bindir)/php$(program_suffix) -d#' ${srcdir}/php-${pkgver}/pear/Makefile.frag
cp -Ta ${srcdir}/build-php ${srcdir}/build-pear
cd ${srcdir}/build-pear
./configure ${_phpconfig} \
@@ -332,16 +333,11 @@ package_php56-pear() {
cd ${srcdir}/build-pear
make install-pear INSTALL_ROOT=${pkgdir}
- rm -rf ${pkgdir}/usr/share/${pkgbase}/pear/.{channels,depdb,depdblock,filemap,lock,registry}
+ rm -rf ${pkgdir}{/usr/share/${pkgbase}/pear,}/.{channels,depdb,depdblock,filemap,lock,registry}
mv ${pkgdir}/usr/bin/{pear,${pkgbase/php/pear}}
mv ${pkgdir}/usr/bin/{peardev,${pkgbase/php/peardev}}
mv ${pkgdir}/usr/bin/{pecl,${pkgbase/php/pecl}}
-
- # fix hardcoded php paths in pear
- sed -i 's|/usr/bin/php|/usr/bin/php56|g' "${pkgdir}/usr/bin/pear56"
- sed -i 's|PHP=php|PHP=php56|g' "${pkgdir}/usr/bin/pear56"
- sed -i 's|s:7:"php_bin";s:12:"/usr/bin/php"|s:7:"php_bin";s:14:"/usr/bin/php56"|' "${pkgdir}/etc/${pkgbase}/pear.conf"
}
package_php56-enchant() {