X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id A41A35C43FF for ; Thu, 2 Mar 2017 12:42:21 +0000 (GMT) Received: from ost.org.ua ([195.144.25.230] helo=alpine.ost.org.ua) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1cjQ3o-0008Jh-T9 for alpine-aports@lists.alpinelinux.org; Thu, 02 Mar 2017 14:42:20 +0200 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH v2] testing/php7.1: swith-on accidentally removed freetype support Date: Thu, 2 Mar 2017 14:42:20 +0200 Message-Id: <20170302124220.12927-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.11.1 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- v1 -> v2: add build-flags description some cleanups in APKBUILD --- testing/php7.1/APKBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/testing/php7.1/APKBUILD b/testing/php7.1/APKBUILD index 74a4e3ce6e..2a4cf1a0de 100644 --- a/testing/php7.1/APKBUILD +++ b/testing/php7.1/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Valery Kartel pkgname=php7.1 pkgver=7.1.2 -pkgrel=4 +pkgrel=5 _apiver=20160303 _suffix=${pkgname#php} _pkgreal=${pkgname%$_suffix} @@ -51,8 +51,9 @@ prepare() { cd "$builddir" sed "$(($(grep -n 'Pool Definitions' sapi/fpm/php-fpm.conf.in | cut -d: -f1)+3)),\$d" \ - -i sapi/fpm/php-fpm.conf.in - echo include=@php_fpm_sysconfdir@/php-fpm.d/*.conf >> sapi/fpm/php-fpm.conf.in + -i sapi/fpm/php-fpm.conf.in && \ + echo include=@php_fpm_sysconfdir@/php-fpm.d/*.conf >> \ + sapi/fpm/php-fpm.conf.in default_prepare || return 1 update_config_sub || return 1 @@ -67,6 +68,10 @@ prepare() { autoconf } +# Notes to ./configure parameters +# --with-libgd -- do not swith to system-wide libgd - runtime bugs. +# --with-xmlrpc -- do not swith to system-wide xmlrpc - build errors. + _build() { export EXTENSION_DIR=/usr/lib/$pkgname/modules ./configure \ @@ -99,7 +104,7 @@ _build() { --enable-exif=shared \ --enable-ftp=shared \ --with-gd=shared --with-jpeg-dir --with-png-dir --with-webp-dir --with-xpm-dir=no \ - --enable-gd-native-ttf --disable-gd-jis-conv \ + --with-freetype-dir --enable-gd-native-ttf --disable-gd-jis-conv \ --with-gettext=shared \ --with-gmp=shared \ --with-iconv=shared \ @@ -141,8 +146,8 @@ _build() { --enable-wddx=shared \ --enable-zip=shared --with-libzip=shared \ $@ || return 1 - sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile - make || return 1 + sed -ri "s/^(EXTRA_LDFLAGS[ ]*\=.*)/\1 -lpthread/" Makefile || return 1 + make } build() { -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---