$NetBSD: patch-configure,v 1.9 2017/04/25 08:58:44 maya Exp $ Portability fix. Solaris seems to need -std=c99 with recent pkgsrc so keep it. don't throw away -std=c++11 on solaris unconditionally, it's required. Add support for Bitrig. --- configure.orig 2017-04-07 07:40:30.000000000 +0000 +++ configure @@ -5175,7 +5175,7 @@ rm -f core conftest.err conftest.$ac_obj *-*-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 @@ -5200,6 +5200,7 @@ rm -f core conftest.err conftest.$ac_obj *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;; *-*-nto*) icu_cv_host_frag=mh-qnx ;; *-ncr-*) icu_cv_host_frag=mh-mpras ;; +-*-sco3.2v5*) icu_cv_host_frag=mh-scoosr5 ;; *) icu_cv_host_frag=mh-unknown ;; esac @@ -5808,6 +5809,29 @@ if test "x$plugins" = "xtrue"; then fi +# check if sys/atomic.h is present. +for ac_header in sys/atomic.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/atomic.h" "ac_cv_header_sys_atomic_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_atomic_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_ATOMIC_H 1 +_ACEOF + +fi + +done + +case "${host}" in +*-netbsd*) +if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then + CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1"; +fi +;; +*) +;; +esac + U_ENABLE_DYLOAD=1 enable=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5 @@ -6021,11 +6045,6 @@ $as_echo "$as_me: Adding CXXFLAGS option else CXXFLAGS="$OLD_CXXFLAGS" fi - case "${host}" in - *-*-solaris*) - CXXFLAGS="$OLD_CXXFLAGS" - ;; - esac fi fi @@ -7776,7 +7795,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 ;; @@ -7812,13 +7831,13 @@ fi # Now that we're done using CPPFLAGS etc. for tests, we can change it # for build. -if test "${CC}" == "clang"; then +if test "${CC}" = "clang"; then CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality" else CLANGCFLAGS="" fi -if test "${CXX}" == "clang++"; then +if test "${CXX}" = "clang++"; then CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality" else CLANGCXXFLAGS=""