[packages/php/dev-7.4] fix build with system gd

glen glen at pld-linux.org
Wed Jun 19 21:47:59 CEST 2019


commit 156728753ddb940956bcc5084c228786a0845d11
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Jun 19 22:39:51 2019 +0300

    fix build with system gd
    
    refs:
    - https://github.com/php/php-src/commit/570d4311b6630bb1fe3378c2d2b216ecda6f1671

 php.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index 52940c6..1225949 100644
--- a/php.spec
+++ b/php.spec
@@ -2338,7 +2338,7 @@ for sapi in $sapis; do
 	%{?with_pdo_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \
 	%{?with_pdo_pgsql:--with-pdo-pgsql=shared} \
 	%{?with_pdo_sqlite:--with-pdo-sqlite=shared,/usr} \
-	%{?with_webp:--with-webp-dir=/usr} \
+	%{?with_webp:--with-webp-dir=/usr --with-webp} \
 	--without-libexpat-dir \
 	%{__enable_disable posix posix shared} \
 	--enable-shared \
@@ -2361,7 +2361,8 @@ for sapi in $sapis; do
 	%{?with_enchant:--with-enchant=shared,/usr} \
 	--with-freetype-dir=shared \
 	%{__with_without gettext gettext shared} \
-	%{__with_without gd gd shared%{?with_system_gd:,/usr}} \
+	%{__enable_disable gd gd shared%{?with_system_gd:,/usr}} \
+	%{?with_system_gd:--with-external-gd} \
 	--with-gdbm \
 	%{__with_without gmp gmp shared} \
 	%{?with_imap:--with-imap=shared --with-imap-ssl} \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/156728753ddb940956bcc5084c228786a0845d11



More information about the pld-cvs-commit mailing list