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