diff options
| author | Thore Boedecker | 2016-01-16 20:27:42 +0100 |
|---|---|---|
| committer | Thore Boedecker | 2016-01-16 20:27:42 +0100 |
| commit | e64d5f3ff99c64ba397d03e2f87140e8cfd26f5e (patch) | |
| tree | 82cf67d6bc8b58941ee38b278a4b992687a225bc | |
| parent | e735502b29c7b9f802a7277c290cb5aa4ad3ee5c (diff) | |
| download | aur-e64d5f3ff99c64ba397d03e2f87140e8cfd26f5e.tar.gz | |
fix pear56 stuff, rename php56-embed filename
pear56 was using some hardcoded /usr/bin/php paths in both the config
file and the "binary" itself.
php56-embed was outputting to /usr/lib/libphp5.so which made it conflict
with the old php-embed package (pre-php7), renamed to /usr/lib/libphp56.so.
This allows users to install the php56 packages before upgrading to
upstream php7 releases.
Signed-off-by: Thore Boedecker <me@foxxx0.de>
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | php-5.6.16.tar.xz.asc | 11 |
3 files changed, 9 insertions, 15 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Jan 14 02:16:48 UTC 2016 +# Sat Jan 16 19:27:21 UTC 2016 pkgbase = php56 pkgdesc = A general-purpose scripting language that is especially suited to web development pkgver = 5.6.17 - pkgrel = 3 + pkgrel = 4 url = http://php.net arch = i686 arch = x86_64 @@ -30,7 +30,7 @@ pkgname=("${pkgbase}" "${pkgbase}-tidy" "${pkgbase}-xsl") pkgver=5.6.17 -pkgrel=3 +pkgrel=4 pkgdesc="A general-purpose scripting language that is especially suited to web development" arch=('i686' 'x86_64') license=('PHP') @@ -311,7 +311,7 @@ package_php56-embed() { depends=("${pkgbase}") provides=("${_pkgbase}-embed=$pkgver") - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp56.so install -D -m644 ${srcdir}/${_pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/${pkgbase}/sapi/embed/php_embed.h } @@ -337,6 +337,11 @@ package_php56-pear() { 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() { diff --git a/php-5.6.16.tar.xz.asc b/php-5.6.16.tar.xz.asc deleted file mode 100644 index 7ea4186922e7..000000000000 --- a/php-5.6.16.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJWVkiUAAoJEMK/C8Qzz8iz54oH/0ymimqFb/RiNKkXex4Aizl4 -Gqu+oIERXXyi0nGizhmP+OjJzrG6pakdigf9ZZqz2m1lKQiNnA50Ksd5o2hdaJW0 -UNl61cjqclNMSaAEvVsabfuR7xohvaR8BydavCigIagNvcoiZvxZUpCeU0slrRM5 -TfWVr6gxB3u0u/9HJBAwKoKqW9I17BDqz7IAKUCpM/c+0m7XrUHuFeJqDBexJZ8O -fchCESOivcU0sC7le3hziKw1UI9a3SyHSda2MsB0eZvC5ujcS6k98faXefkTSzrc -qYAAqUuRuY8xrnhkVNunEod/Wun/MwY980hfTMXvtVUgzv5rVo8uBrGQXf5+Fu8= -=om+M ------END PGP SIGNATURE----- |