~alpine/aports

[alpine-aports] [PATCH v2] testing/php7.1: swith-on accidentally removed freetype support

Details
Message ID
<20170302124220.12927-1-valery.kartel@gmail.com>
Sender timestamp
1488458540
DKIM signature
missing
Download raw message
Patch: +11 -6
---
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 <valery.kartel@gmail.com>
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
---
Reply to thread Export thread (mbox)