From a24a76783ea83225ebe242306fd3475bff34698c Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Thu, 7 Jul 2022 22:37:22 +0200 Subject: [PATCH] php8: fixup libiconv usage (refs openwrt/openwrt#10024) Since the OpenWrt's stub libiconv implementation is now gone, we can build against musl's internal one or the external libiconv implementation. This needs minor adjustements in the makefile to allow PHPs build to choose the right path when cross-compiling. Signed-off-by: Michael Heimpold --- lang/php8/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lang/php8/Makefile b/lang/php8/Makefile index ebe56e0378..e1aee1ba16 100644 --- a/lang/php8/Makefile +++ b/lang/php8/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=8.1.7 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Michael Heimpold PKG_LICENSE:=PHP-3.01 @@ -270,7 +270,13 @@ else endif ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-iconv),) - CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)" + ifeq ($(CONFIG_BUILD_NLS),y) + CONFIGURE_VARS+= iconv_impl_name="gnu_libiconv" + CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)" + else + CONFIGURE_VARS+= ac_cv_func_iconv=yes + CONFIGURE_ARGS+= --with-iconv=shared + endif else CONFIGURE_ARGS+= --without-iconv endif @@ -485,7 +491,6 @@ endif CONFIGURE_VARS+= \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ php_cv_cc_rpath="no" \ - iconv_impl_name="gnu_libiconv" \ ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \ ac_cv_u8t_decompose=yes \ ac_cv_have_pcre2_jit=no -- 2.30.2