diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-23 10:32:13 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-23 10:32:13 +0100 |
| commit | cc98017bbad1f9abb4fd76c68a158f356926a164 (patch) | |
| tree | 1c3bb2e1c6bf899d35d5b7f58e798a4d9d63e1d1 /extra/php | |
| parent | 40ee6ff3cb6c8b9b90e75463ce9dc37bdcd0d79b (diff) | |
| parent | c8c918cb8c810e3300e5165f9af7ca8ab9650a59 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/freeimage/PKGBUILD
extra/php/PKGBUILD
Diffstat (limited to 'extra/php')
| -rw-r--r-- | extra/php/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index f77fec4a5..a5ff7ec7c 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175873 2013-01-23 00:13:10Z eric $ +# $Id: PKGBUILD 178435 2013-02-22 07:43:22Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -21,8 +21,8 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.4.11 -pkgrel=2.1 +pkgver=5.4.12 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('9975e68c22b86b013b934743ad2d2276' +md5sums=('5c7b614242ae12e9cacca21c8ab84818' '0b0bc7a917fc592bdf11dcd3c5c255e9' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' @@ -124,6 +124,9 @@ build() { patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + # workaround for pkg-config 0.28 + sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure + # php mkdir ${srcdir}/build-php cd ${srcdir}/build-php |