Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed bug #76153 Intl compilation fails with icu4c 61.1
Additionally, ICU >= 59.1 requires C++11, so add the flags. Some refactoring is needed to comply with the latest recommended build options, such as automatic icu namespace addition.
- Loading branch information
Showing
3 changed files
with
5 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2248,6 +2248,9 @@ AC_DEFUN([PHP_SETUP_ICU],[ | |
ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` | ||
PHP_EVAL_INCLINE($ICU_INCS) | ||
PHP_EVAL_LIBLINE($ICU_LIBS, $1) | ||
ICU_EXTRA_FLAGS=`$ICU_CONFIG --cxxflags` | ||
ICU_EXTRA_FLAGS="$ICU_EXTRA_FLAGS -DU_USING_ICU_NAMESPACE=1" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
weltling
Author
Contributor
|
||
fi | ||
]) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 comment
on commit 710284c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@srl295 as you feared, it looks like some upstreams are not using the namespace in response to this change.
@weltling please fix the source to use the icu:: namespace. See the docs: