|
@@ -176,13 +176,8 @@ endif
|
|
endif
|
|
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_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`"
|
|
|
|
|
|
+PHP_CONF_OPTS += --enable-intl
|
|
PHP_DEPENDENCIES += icu
|
|
PHP_DEPENDENCIES += icu
|
|
-# The intl module is implemented in C++, but PHP fails to use
|
|
|
|
-# g++ as the compiler for the final link. As a workaround,
|
|
|
|
-# tell it to link libstdc++.
|
|
|
|
-PHP_EXTRA_LIBS += -lstdc++
|
|
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
|
|
ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y)
|