[Buildroot] [PATCH 1/2] package/php: fix zip support

[Buildroot] [PATCH 1/2] package/php: fix zip support

[Louis Aussedat]

since php7.4, --enable-zip becomes --with-zip due to
migration to pkg-config.

Signed-off-by: Louis Aussedat <aussedat.louis@gmail.com>
---
 package/php/php.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/php/php.mk b/package/php/php.mk
index 91f82dbf31..8282bb1cc7 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -113,7 +113,7 @@ PHP_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \
 	$(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \
 	$(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \
-	$(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \
+	$(if $(BR2_PACKAGE_PHP_EXT_ZIP),--with-zip) \
 	$(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \
 	$(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \
 	$(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \
-- 
2.26.0

[Buildroot] [PATCH 2/2] package/php: fix gd dependencies

[Louis Aussedat]

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>
---
 package/php/Config.ext |  1 +
 package/php/php.mk     | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/php/Config.ext b/package/php/Config.ext
index 193bc1bd03..66ee935cf0 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -256,6 +256,7 @@ config BR2_PACKAGE_PHP_EXT_GD
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_ZLIB
 	help
 	  GD support
 
diff --git a/package/php/php.mk b/package/php/php.mk
index 8282bb1cc7..4d2f1b8f63 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -327,12 +327,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y)
 PHP_CONF_OPTS += \
-	--with-gd \
-	--with-jpeg-dir=$(STAGING_DIR)/usr \
-	--with-png-dir=$(STAGING_DIR)/usr \
-	--with-zlib-dir=$(STAGING_DIR)/usr \
-	--with-freetype-dir=$(STAGING_DIR)/usr
-PHP_DEPENDENCIES += jpeg libpng freetype
+	--enable-gd \
+	--with-jpeg \
+	--with-freetype
+PHP_DEPENDENCIES += jpeg libpng freetype zlib
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y)
-- 
2.26.0

[Buildroot] [PATCH 1/2] package/php: fix zip support

[Thomas Petazzoni]

On Sat, 18 Apr 2020 11:03:42 +0200
Louis Aussedat <aussedat.louis@gmail.com> wrote:

> since php7.4, --enable-zip becomes --with-zip due to
> migration to pkg-config.
> 
> Signed-off-by: Louis Aussedat <aussedat.louis@gmail.com>
> ---
>  package/php/php.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/php: fix gd dependencies

[Thomas Petazzoni]

Hello Louis,

On Sat, 18 Apr 2020 11:03:43 +0200
Louis Aussedat <aussedat.louis@gmail.com> wrote:

> 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>

I've applied. However, we are currently using the bundled libgd source
code that comes from PHP, but it would be good to use an external gd
library from package/gd. This would also allow to make the
freetype/jpeg dependencies optional.

Could you have a look at doing this?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/2] package/php: fix zip support

[Peter Korsgaard]

>>>>> "Louis" == Louis Aussedat <aussedat.louis@gmail.com> writes:

 > since php7.4, --enable-zip becomes --with-zip due to
 > migration to pkg-config.

 > Signed-off-by: Louis Aussedat <aussedat.louis@gmail.com>

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] package/php: fix gd dependencies

[Peter Korsgaard]

>>>>> "Louis" == Louis Aussedat <aussedat.louis@gmail.com> writes:

 > 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>

Committed to 2020.02.x, thanks.

-- 
Bye, Peter Korsgaard