mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 14:01:57 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/php: fix gd extension dependencies and options

Browse Source 
Due to migration to pkg-config in php 7.4, the detection of
library dependencies has been changed.

source from php.net:
--with-gd becomes --enable-gd
--with-png-dir has been removed. libpng is required.
--with-zlib-dir has been removed. zlib is required.
--with-freetype-dir becomes --with-freetype
--with-jpeg-dir becomes --with-jpeg

Signed-off-by: Louis Aussedat <aussedat.louis@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Louis Aussedat
2020-04-18 11:03:43 +02:00
committed by Thomas Petazzoni
parent ac2b371732
commit 31c5fd8f4b
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/php/Config.ext
View File

@@ -256,6 +256,7 @@ config BR2_PACKAGE_PHP_EXT_GD
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_ZLIB
help help
GD support GD support

10
package/php/php.mk
View File

@@ -327,12 +327,10 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y) ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y)
PHP_CONF_OPTS += \ PHP_CONF_OPTS += \
--with-gd \ --enable-gd \
--with-jpeg-dir=$(STAGING_DIR)/usr \ --with-jpeg \
--with-png-dir=$(STAGING_DIR)/usr \ --with-freetype
--with-zlib-dir=$(STAGING_DIR)/usr \ PHP_DEPENDENCIES += jpeg libpng freetype zlib
--with-freetype-dir=$(STAGING_DIR)/usr
PHP_DEPENDENCIES += jpeg libpng freetype
endif endif
ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y)