organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 17:01:16 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-11437 revert r37938 r37939 (also ICU-11435 ) - try to unbreak Solaris

Browse source 
X-SVN-Rev: 37945
This commit is contained in:
Steven R. Loomis 2015-09-11 02:01:12 +00:00
parent 4f8296e079
commit 39f698cbc3
5 changed files with 5 additions and 9 deletions

2
icu4c/source/acinclude.m4
View file

@ -57,7 +57,7 @@ x86_64-*-cygwin)
*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
esac
fi ;;
*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-aix*)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-aix-gcc

4
icu4c/source/common/uposixdefs.h
View file

@ -42,10 +42,8 @@
* and define _XOPEN_SOURCE to different values depending on __STDC_VERSION__.
* In C++ source code (e.g., putil.cpp), __STDC_VERSION__ is not defined at all.
*/
#if !defined(_SCO_DS)
# define _XOPEN_SOURCE 600
#endif
#endif
/*
* Make sure things like readlink and such functions work.
@ -54,11 +52,9 @@
*
* z/OS needs this definition for timeval and to get usleep.
*/
#if !defined(__sun) && !defined(_SCO_DS)
#if !defined(_XOPEN_SOURCE_EXTENDED)
# define _XOPEN_SOURCE_EXTENDED 1
#endif
#endif
/*
* There is an issue with turning on _XOPEN_SOURCE_EXTENDED on certain platforms.

4
icu4c/source/configure vendored
View file

@ -5174,7 +5174,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
esac
fi ;;
*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-aix*)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-aix-gcc
@ -7729,7 +7729,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
case "${host}" in
*-*-solaris*) platform=U_SOLARIS ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;;
*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;;
*-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;;
*-*-aix*) platform=U_AIX ;;
*-*-hpux*) platform=U_HPUX ;;
*-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;

2
icu4c/source/configure.ac
View file

@ -1251,7 +1251,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
case "${host}" in
*-*-solaris*) platform=U_SOLARIS ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) platform=U_LINUX ;;
*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;;
*-*-*bsd*|*-*-dragonfly*) platform=U_BSD ;;
*-*-aix*) platform=U_AIX ;;
*-*-hpux*) platform=U_HPUX ;;
*-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;;

2
icu4c/source/runConfigureICU
View file

@ -327,7 +327,7 @@ case $platform in
DEBUG_CXXFLAGS='-Zi -MDd'
DEBUG_LDFLAGS='-DEBUG'
;;
*BSD | DragonFly | Bitrig)
*BSD)
THE_OS="BSD"
THE_COMP="the GNU C++"
DEBUG_CFLAGS='-g -O0'