mirror/openwrt-packages
1
0
Fork 0
mirror of https://git.openwrt.org/feed/packages.git synced 2024-06-15 03:43:53 +02:00
Code Releases Activity

Merge pull request #18919 from mhei/php8-full-libiconv

Browse Source 
php8: fixup libiconv usage (refs openwrt/openwrt#10024)
This commit is contained in:
Michael Heimpold 2022-07-19 19:20:11 +02:00 committed by GitHub
commit 61b31a3157
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lang/php8/Makefile
View File

@ -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 <mhei@heimpold.de>
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