diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 15:30:18 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-29 15:30:18 +0000 |
commit | bd188761b001ad821209334ebf51957a5b526c97 (patch) | |
tree | 8ddf467dc5ec34f62a4db4bddac6c0df94573e46 | |
parent | 524965144455ca56888b64864bbd6f4db1fd5b31 (diff) | |
download | alpine_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/APKBUILD | 11 |
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> |
3 | pkgname=php | 3 | pkgname=php |
4 | pkgver=5.5.5 | 4 | pkgver=5.5.5 |
5 | pkgrel=0 | 5 | pkgrel=1 |
6 | pkgdesc="The PHP language runtime engine" | 6 | pkgdesc="The PHP language runtime engine" |
7 | url="http://www.php.net/" | 7 | url="http://www.php.net/" |
8 | arch="all" | 8 | arch="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 | ||
374 | apache2() { | 373 | apache2() { |
@@ -450,8 +449,8 @@ intl() { _mv_ext intl; } | |||
450 | json() { _mv_ext json; } | 449 | json() { _mv_ext json; } |
451 | ldap() { _mv_ext ldap; } | 450 | ldap() { _mv_ext ldap; } |
452 | mcrypt() { _mv_ext mcrypt; } | 451 | mcrypt() { _mv_ext mcrypt; } |
453 | mysql() { _mv_ext mysql mysql; } | 452 | mysql() { _mv_ext mysql; } |
454 | mysqli() { _mv_ext mysqli mysql; } | 453 | mysqli() { _mv_ext mysqli; } |
455 | odbc() { _mv_ext odbc unixodbc; } | 454 | odbc() { _mv_ext odbc unixodbc; } |
456 | openssl() { _mv_ext openssl; } | 455 | openssl() { _mv_ext openssl; } |
457 | pdo() { _mv_ext pdo; } | 456 | pdo() { _mv_ext pdo; } |