---
testing/php7/APKBUILD | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD
index 046dd65..f53a6f8 100644
--- a/testing/php7/APKBUILD
+++ b/testing/php7/APKBUILD
@@ -3,10 +3,10 @@
pkgname=php7
_pkgreal=php
pkgver=7.0.5
-pkgrel=0
+pkgrel=1
pkgdesc="The PHP language runtime engine - 7th branch"
url="http://www.php.net/"
-arch="x86_64 armhf"
+arch="all"
license="PHP-3"
options="textrels"
depends="$pkgname-common"
@@ -16,7 +16,7 @@ makedepends="autoconf bison re2c apache2-dev libxml2-dev libxslt-dev libzip-dev
libical-dev openssl-dev openldap-dev net-snmp-dev db-dev krb5-dev gdbm-dev sqlite-dev
freetds-dev mariadb-dev postgresql-dev unixodbc-dev freetype-dev tidyhtml-dev libxpm-dev
libpng-dev libwebp-dev libjpeg-turbo-dev libmcrypt-dev libmbfl-dev gsoap-dev recode-dev
- readline-dev mhash-dev paxmark
+ readline-dev mhash-dev paxmark gettext-dev
"
subpackages="$pkgname-dev $pkgname-doc
@@ -35,6 +35,7 @@ subpackages="$pkgname-dev $pkgname-doc
$pkgname-gd
$pkgname-gettext
$pkgname-gmp
+ $pkgname-iconv
$pkgname-imap
$pkgname-intl
$pkgname-json
@@ -120,6 +121,7 @@ _build() {
--sysconfdir=/etc/$pkgname \
--localstatedir=/var \
--with-layout=GNU \
+ --with-pic \
--with-pear=/usr/share/$pkgname \
--with-config-file-path=/etc/$pkgname \
--with-config-file-scan-dir=/etc/$pkgname/conf.d \
@@ -142,6 +144,7 @@ _build() {
--with-gettext=shared \
--with-gmp=shared \
--with-mhash=shared \
+ --with-iconv=shared \
--with-imap=shared --with-imap-ssl \
--enable-intl=shared --with-icu-dir=/usr \
--enable-json=shared \
@@ -323,23 +326,23 @@ common() {
_mv_ext() {
local ext=$1
- local ini=$ext.ini
- local dir=/usr/lib/$pkgname/modules
+ local elo=00
local prefix=
pkgdesc="PHP7 extension: $ext"
- # extension dependencies
- [ -n "${2-}" ] && depends=$2
+ # extension dependencies and loading order
+ if [ -n "${2-}" ]; then
+ depends=$2
+ elo=01
+ fi
- # work around dependency issue
- # https://bugs.alpinelinux.org/issues/1848
- [ "$ext" = "wddx" ] && ini=xml_$ext.ini
+ # extension prefix
+ [ "$1" = "opcache" ] && prefix="zend_"
mkdir -p "$subpkgdir"/usr/lib/$pkgname/modules "$subpkgdir"/etc/$pkgname/conf.d
mv "$pkgdir"/usr/lib/$pkgname/modules/${ext}.so \
"$subpkgdir"/usr/lib/$pkgname/modules/ || return 1
- [ "$1" = "opcache" ] && prefix="zend_"
- echo "${prefix}extension=${ext}.so" > "$subpkgdir"/etc/$pkgname/conf.d/$ini
+ echo "${prefix}extension=${ext}.so" > "$subpkgdir"/etc/$pkgname/conf.d/${elo}_${ext}.ini
}
bcmath() { _mv_ext bcmath; }
@@ -355,6 +358,7 @@ ftp() { _mv_ext ftp; }
gd() { _mv_ext gd; }
gettext() { _mv_ext gettext; }
gmp() { _mv_ext gmp; }
+iconv() { _mv_ext iconv; }
imap() { _mv_ext imap; }
intl() { _mv_ext intl; }
json() { _mv_ext json; }
--
2.8.0
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---