openwrt/packages
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/packages.git synced 2025-05-01 13:30:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

php7: fixup libiconv usage

Browse Source 
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 <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2023-01-25 12:44:58 +08:00 committed by Linhui Liu
parent 22522e5048
commit a2dd0f0e55
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/php7/Makefile
View File

@ -254,7 +254,13 @@ else
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-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
@ -471,7 +477,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