diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-05-04 03:17:21 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-05-11 13:07:18 +0200 |
| commit | 8f4afa841ae9b9c0a3f58e4edfc69be871c0dd2a (patch) | |
| tree | 5c619041e049974fe51de4dc7fc302debf32951d /community/php7 | |
| parent | a790b93a3cac5c82cb545b6213101b44b5d8f952 (diff) | |
| download | aports-8f4afa841ae9b9c0a3f58e4edfc69be871c0dd2a.tar.bz2 aports-8f4afa841ae9b9c0a3f58e4edfc69be871c0dd2a.tar.xz | |
community/php7: fix imap ext to be loaded after recode
See https://github.com/alpinelinux/aports/pull/1339/files#r114501722
Diffstat (limited to 'community/php7')
| -rw-r--r-- | community/php7/APKBUILD | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index 15c6812498..56e8b95586 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -20,7 +20,7 @@ pkgname=php7 _pkgreal=php pkgver=7.1.4 -pkgrel=1 +pkgrel=2 _apiver=20160303 _suffix=${pkgname#php} # Is this package the default (latest) PHP version? @@ -345,11 +345,9 @@ check() { # PHP is so stupid that it's not able to resolve dependencies # between extensions and load them in correct order, so we must # help it... - # * opcache is Zend extension, it's handled specially in Makefile - # * imap can't be loaded together with recode, so we must omit it + # opcache is Zend extension, it's handled specially in Makefile local php_modules=$(_extensions_by_load_order \ | grep -vx opcache \ - | grep -vx imap \ | xargs -n 1 printf "'$builddir/modules/%s.la' ") sed -i "/^PHP_TEST_SHARED_EXTENSIONS/,/extension=/ \ s|in \$(PHP_MODULES)\"*|in $php_modules|" Makefile @@ -582,13 +580,18 @@ _resolve_extension_deps() { # Prints a load order (0-based integer) for the given extension name. Extension # with lower load order should be loaded before exts with higher load order. -# It's based on number of dependencies of the extension, which is flawed, but -# simple and good enough for now. +# It's based on number of dependencies of the extension (with exception for +# "imap"), which is flawed, but simple and good enough for now. _extension_load_order() { local name="$1" local deps=$(eval "echo \$_depends_$name") - echo "${deps:=$(_resolve_extension_deps $name)}" | wc -w + case "$name" in + # XXX: This must be loaded after recode, even though it does + # not depend on it. So we must use this hack... + imap) echo 1;; + *) echo "${deps:=$(_resolve_extension_deps $name)}" | wc -w;; + esac } # Prints $_extensions sorted by load order and name. |