X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id 2C9E6DC023F for ; Tue, 29 Mar 2016 06:58:50 +0000 (UTC) Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id D8B38DC009B for ; Tue, 29 Mar 2016 06:58:49 +0000 (UTC) Received: from aveo.com.ua ([195.144.25.27] helo=alpine) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1aknbz-0003Fh-Vh; Tue, 29 Mar 2016 09:58:48 +0300 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Cc: Valery Kartel Subject: [alpine-aports] [PATCH] testing/php7: Add extension loading order filename prefix generation based on dependencies number Date: Tue, 29 Mar 2016 10:03:31 +0300 Message-Id: <1459235011-29223-1-git-send-email-valery.kartel@gmail.com> X-Mailer: git-send-email 2.7.4 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/php7/APKBUILD | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/testing/php7/APKBUILD b/testing/php7/APKBUILD index 0e2115b..d8fca7d 100644 --- a/testing/php7/APKBUILD +++ b/testing/php7/APKBUILD @@ -3,7 +3,7 @@ pkgname=php7 _pkgreal=php pkgver=7.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="The PHP language runtime engine - 7th branch" url="http://www.php.net/" arch="x86_64 armhf" @@ -323,23 +323,21 @@ 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 - - # work around dependency issue - # https://bugs.alpinelinux.org/issues/1848 - [ "$ext" = "wddx" ] && ini=xml_$ext.ini + # extension dependencies and load order + if [ -n "${2-}" ]; then + depends=$2 + elo=$(echo $2 | wc -w | awk '{printf "%02d", $1}') + fi 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; } -- 2.7.4 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---