community/php5: backport dependency fixes from edge

1 files changed, 11 insertions, 5 deletions

diff --git a/community/php5/APKBUILD b/community/php5/APKBUILD
index dcde76a631..fad85a675b 100644
--- a/community/php5/APKBUILD
+++ b/community/php5/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Matt Smith <mcs@darkregion.net>
 pkgname=php5
 pkgver=5.6.38
-pkgrel=0
+pkgrel=1
 pkgdesc="The PHP language runtime engine"
 url="http://www.php.net/"
 arch="all"
@@ -12,7 +12,7 @@ license="PHP-3.0"
 depends="$pkgname-cli"
 depends_dev="$pkgname-cli pcre-dev"
 install="$pkgname.post-upgrade"
-provides="$pkgname-cli php-cli php"
+provides="php"
 makedepends="
         $depends_dev
         apache2-dev
@@ -108,7 +108,7 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-common::noarch $pkg
         $pkgname-opcache
         "
 
-source="http://php.net/distributions/php-$pkgver.tar.bz2
+source="https://php.net/distributions/php-$pkgver.tar.bz2
         php-fpm.initd
         php5-module.conf
         php-install-pear-xml.patch
@@ -169,6 +169,10 @@ _do_build() {
         cd "$_builddir"
         export EXTENSION_DIR=$_extdir
         export PEAR_INSTALLDIR="$_peardir"
+
+        #http://source.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild
+        export CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE=1"
+
         "$_srcdir"/configure $@ || return 1
         sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile  # see #183
         make || return 1
@@ -371,6 +375,7 @@ cgi() {
 cli() {
         pkgdesc="PHP Command Line Interface (CLI)"
         depends="$pkgname-common"
+        provides="php-cli"
         mkdir -p "$subpkgdir"/usr/bin
         mv "$pkgdir"/usr/bin/php5 "$subpkgdir"/usr/bin/ || return 1
         # provide phpize here instead of -dev due to pecl command
@@ -432,6 +437,7 @@ pear() {
 
 phpdbg() {
         pkgdesc="Interactive PHP debugger"
+        depends="$pkgname-common"
         provides="php-phpdbg"
         mkdir -p "$subpkgdir"/usr/bin
         mv "$pkgdir"/usr/bin/phpdbg* "$subpkgdir"/usr/bin/
@@ -442,12 +448,12 @@ _mv_ext() {
         local ini=$ext.ini
         pkgdesc="${ext} extension for PHP"
         provides="php-$extname"
+        depends="${pkgname}-common"
 
         # extension dependencies
         if [ -n "${2-}" ]; then
-                depends="${2-}"
+                depends="${depends} ${2-}"
         fi
-        depends="${pkgname} ${depends}"
 
         # work around dependency issue
         # https://bugs.alpinelinux.org/issues/1848