jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/php: fix icu support

Browse Source 
Propagate icu reverse dependencies.

Php lacks "-std=c++11", provided by icu-config, when compiling icu
support leading to a build failure:

/home/peko/autobuild/instance-1/output/host/usr/sh4-buildroot-linux-uclibc/sysroot/usr/include/unicode/umachine.h:347:13:
 error: 'char16_t' does not name a type
     typedef char16_t UChar;

Fixes
http://autobuild.buildroot.net/results/238/238d0e4bb205c0e7288903c6498e6c1787d86a1b/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2017-06-10 10:43:33 +02:00 committed by Thomas Petazzoni
parent 2af5c1ff75
commit 214a76d045
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/php/Config.ext
View File

@ -180,17 +180,22 @@ config BR2_PACKAGE_PHP_EXT_ICONV
config BR2_PACKAGE_PHP_EXT_INTL config BR2_PACKAGE_PHP_EXT_INTL
bool "intl" bool "intl"
depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
depends on BR2_INSTALL_LIBSTDCPP depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
depends on !BR2_BINFMT_FLAT # icu depends on !BR2_BINFMT_FLAT # icu
depends on BR2_TOOLCHAIN_HAS_THREADS # icu depends on BR2_TOOLCHAIN_HAS_THREADS # icu
select BR2_PACKAGE_ICU select BR2_PACKAGE_ICU
help help
Internationalization support Internationalization support
comment "intl support needs a toolchain w/ C++, wchar, threads" comment "intl support needs a toolchain w/ C++, wchar, threads, gcc >= 4.8, host gcc >= 4.8"
depends on !BR2_BINFMT_FLAT depends on !BR2_BINFMT_FLAT
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
!BR2_HOST_GCC_AT_LEAST_4_8
config BR2_PACKAGE_PHP_EXT_MBSTRING config BR2_PACKAGE_PHP_EXT_MBSTRING
bool "mbstring" bool "mbstring"

4
package/php/php.mk
View File

@ -55,6 +55,7 @@ endif
PHP_CONFIG_SCRIPTS = php-config PHP_CONFIG_SCRIPTS = php-config
PHP_CFLAGS = $(TARGET_CFLAGS) PHP_CFLAGS = $(TARGET_CFLAGS)
PHP_CXXFLAGS = $(TARGET_CXXFLAGS)
# The OPcache extension isn't cross-compile friendly # The OPcache extension isn't cross-compile friendly
# Throw some defines here to avoid patching heavily # Throw some defines here to avoid patching heavily
@ -173,6 +174,7 @@ endif
ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
PHP_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`"
PHP_DEPENDENCIES += icu PHP_DEPENDENCIES += icu
# The intl module is implemented in C++, but PHP fails to use # The intl module is implemented in C++, but PHP fails to use
# g++ as the compiler for the final link. As a workaround, # g++ as the compiler for the final link. As a workaround,
@ -343,6 +345,6 @@ endef
PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP
PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)" PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)" CXXFLAGS="$(PHP_CXXFLAGS)"
$(eval $(autotools-package)) $(eval $(autotools-package))