aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-10-29 15:30:18 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-10-29 15:30:18 +0000
commitbd188761b001ad821209334ebf51957a5b526c97 (patch)
tree8ddf467dc5ec34f62a4db4bddac6c0df94573e46 /main
parent524965144455ca56888b64864bbd6f4db1fd5b31 (diff)
downloadaports-bd188761b001ad821209334ebf51957a5b526c97.tar.bz2
aports-bd188761b001ad821209334ebf51957a5b526c97.tar.xz
main/php: mysl module should not depend on mysql (server)
It should pull in the needed client libs automatically
Diffstat (limited to 'main')
-rw-r--r--main/php/APKBUILD11
1 files changed, 5 insertions, 6 deletions
diff --git a/main/php/APKBUILD b/main/php/APKBUILD
index 427edd6e94..72fc04d9de 100644
--- a/main/php/APKBUILD
+++ b/main/php/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Matt Smith <mcs@darkregion.net>
pkgname=php
pkgver=5.5.5
-pkgrel=0
+pkgrel=1
pkgdesc="The PHP language runtime engine"
url="http://www.php.net/"
arch="all"
@@ -293,10 +293,10 @@ package() {
# enable some default options
sed -ri -e "s~^;(error_log)(.*)~\1 = /var/log/php-fpm.log~" \
-e "s/^;(pm.start_servers)/\1/" \
- -e "s/^;(pm.min_spare_servers)/\1/" \
+ -e "s/^;(pm.min_spare_servers)/\1/" \
-e "s/^;(pm.max_spare_servers)/\1/" \
"$pkgdir"/etc/php/php-fpm.conf || return 1
-
+
# install apache2
install -D -m755 "$srcdir"/build-apache2/libs/libphp5.so \
"$pkgdir"/usr/lib/apache2/libphp5.so || return 1
@@ -368,7 +368,6 @@ fpm() {
mv "$pkgdir"/usr/bin/php-fpm "$subpkgdir"/usr/bin/ || return 1
mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1
mv "$pkgdir"/etc/php/php-fpm.conf "$subpkgdir"/etc/php/
-
}
apache2() {
@@ -450,8 +449,8 @@ intl() { _mv_ext intl; }
json() { _mv_ext json; }
ldap() { _mv_ext ldap; }
mcrypt() { _mv_ext mcrypt; }
-mysql() { _mv_ext mysql mysql; }
-mysqli() { _mv_ext mysqli mysql; }
+mysql() { _mv_ext mysql; }
+mysqli() { _mv_ext mysqli; }
odbc() { _mv_ext odbc unixodbc; }
openssl() { _mv_ext openssl; }
pdo() { _mv_ext pdo; }