aboutsummaryrefslogtreecommitdiff
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
parent524965144455ca56888b64864bbd6f4db1fd5b31 (diff)
downloadalpine_aports-bd188761b001ad821209334ebf51957a5b526c97.tar.bz2
alpine_aports-bd188761b001ad821209334ebf51957a5b526c97.tar.xz
alpine_aports-bd188761b001ad821209334ebf51957a5b526c97.zip
main/php: mysl module should not depend on mysql (server)
It should pull in the needed client libs automatically
-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 @@
2# Maintainer: Matt Smith <mcs@darkregion.net> 2# Maintainer: Matt Smith <mcs@darkregion.net>
3pkgname=php 3pkgname=php
4pkgver=5.5.5 4pkgver=5.5.5
5pkgrel=0 5pkgrel=1
6pkgdesc="The PHP language runtime engine" 6pkgdesc="The PHP language runtime engine"
7url="http://www.php.net/" 7url="http://www.php.net/"
8arch="all" 8arch="all"
@@ -293,10 +293,10 @@ package() {
293 # enable some default options 293 # enable some default options
294 sed -ri -e "s~^;(error_log)(.*)~\1 = /var/log/php-fpm.log~" \ 294 sed -ri -e "s~^;(error_log)(.*)~\1 = /var/log/php-fpm.log~" \
295 -e "s/^;(pm.start_servers)/\1/" \ 295 -e "s/^;(pm.start_servers)/\1/" \
296 -e "s/^;(pm.min_spare_servers)/\1/" \ 296 -e "s/^;(pm.min_spare_servers)/\1/" \
297 -e "s/^;(pm.max_spare_servers)/\1/" \ 297 -e "s/^;(pm.max_spare_servers)/\1/" \
298 "$pkgdir"/etc/php/php-fpm.conf || return 1 298 "$pkgdir"/etc/php/php-fpm.conf || return 1
299 299
300 # install apache2 300 # install apache2
301 install -D -m755 "$srcdir"/build-apache2/libs/libphp5.so \ 301 install -D -m755 "$srcdir"/build-apache2/libs/libphp5.so \
302 "$pkgdir"/usr/lib/apache2/libphp5.so || return 1 302 "$pkgdir"/usr/lib/apache2/libphp5.so || return 1
@@ -368,7 +368,6 @@ fpm() {
368 mv "$pkgdir"/usr/bin/php-fpm "$subpkgdir"/usr/bin/ || return 1 368 mv "$pkgdir"/usr/bin/php-fpm "$subpkgdir"/usr/bin/ || return 1
369 mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1 369 mv "$pkgdir"/etc/init.d "$subpkgdir"/etc/ || return 1
370 mv "$pkgdir"/etc/php/php-fpm.conf "$subpkgdir"/etc/php/ 370 mv "$pkgdir"/etc/php/php-fpm.conf "$subpkgdir"/etc/php/
371
372} 371}
373 372
374apache2() { 373apache2() {
@@ -450,8 +449,8 @@ intl() { _mv_ext intl; }
450json() { _mv_ext json; } 449json() { _mv_ext json; }
451ldap() { _mv_ext ldap; } 450ldap() { _mv_ext ldap; }
452mcrypt() { _mv_ext mcrypt; } 451mcrypt() { _mv_ext mcrypt; }
453mysql() { _mv_ext mysql mysql; } 452mysql() { _mv_ext mysql; }
454mysqli() { _mv_ext mysqli mysql; } 453mysqli() { _mv_ext mysqli; }
455odbc() { _mv_ext odbc unixodbc; } 454odbc() { _mv_ext odbc unixodbc; }
456openssl() { _mv_ext openssl; } 455openssl() { _mv_ext openssl; }
457pdo() { _mv_ext pdo; } 456pdo() { _mv_ext pdo; }