From a6fd360ff32bb4753391168f6bf4f801baff6623 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 10 Sep 2015 06:26:57 +0000 Subject: [PATCH] ICU-11435 Bitrig fixes. Incorporates ICU-11881 and ICU-11882 X-SVN-Rev: 37938 --- icu4c/source/acinclude.m4 | 2 +- icu4c/source/configure | 4 ++-- icu4c/source/configure.ac | 2 +- icu4c/source/runConfigureICU | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/icu4c/source/acinclude.m4 b/icu4c/source/acinclude.m4 index b64e984b6c3..454affe5445 100644 --- a/icu4c/source/acinclude.m4 +++ b/icu4c/source/acinclude.m4 @@ -57,7 +57,7 @@ x86_64-*-cygwin) *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;; esac fi ;; -*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;; +*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) icu_cv_host_frag=mh-bsd-gcc ;; *-*-aix*) if test "$GCC" = yes; then icu_cv_host_frag=mh-aix-gcc diff --git a/icu4c/source/configure b/icu4c/source/configure index 7190d41c8eb..2e3fdb18fb3 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -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*) icu_cv_host_frag=mh-bsd-gcc ;; +*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 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*) platform=U_BSD ;; + *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; *-*-aix*) platform=U_AIX ;; *-*-hpux*) platform=U_HPUX ;; *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac index 595bd122cee..8fd98bb277e 100644 --- a/icu4c/source/configure.ac +++ b/icu4c/source/configure.ac @@ -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*) platform=U_BSD ;; + *-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) platform=U_BSD ;; *-*-aix*) platform=U_AIX ;; *-*-hpux*) platform=U_HPUX ;; *-apple-darwin*|*-apple-rhapsody*) platform=U_DARWIN ;; diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU index 700122789fc..d6e6a2305f1 100755 --- a/icu4c/source/runConfigureICU +++ b/icu4c/source/runConfigureICU @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 1999-2014, International Business Machines Corporation and +# Copyright (c) 1999-2015, International Business Machines Corporation and # others. All Rights Reserved. # runConfigureICU: This script will run the "configure" script for the appropriate platform @@ -327,7 +327,7 @@ case $platform in DEBUG_CXXFLAGS='-Zi -MDd' DEBUG_LDFLAGS='-DEBUG' ;; - *BSD) + *BSD | DragonFly | Bitrig) THE_OS="BSD" THE_COMP="the GNU C++" DEBUG_CFLAGS='-g -O0' -- 2.40.0