summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/libs/icu/ChangeLog4
-rwxr-xr-xBuild/source/libs/icu/configure16
-rw-r--r--Build/source/libs/icu/configure.ac10
3 files changed, 26 insertions, 4 deletions
diff --git a/Build/source/libs/icu/ChangeLog b/Build/source/libs/icu/ChangeLog
index db1e2d151cd..7cb11dac747 100644
--- a/Build/source/libs/icu/ChangeLog
+++ b/Build/source/libs/icu/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Avoid using '--disable-strict' for Solaris.
+
2014-03-20 Peter Breitenlohner <peb@mppmu.mpg.de>
Import icu-53.1 (53_rc).
diff --git a/Build/source/libs/icu/configure b/Build/source/libs/icu/configure
index 4b180f77e36..46d63bb6ee0 100755
--- a/Build/source/libs/icu/configure
+++ b/Build/source/libs/icu/configure
@@ -4236,18 +4236,30 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
if test "x$cache_file" != x/dev/null; then
icu_config="$icu_config -C"
fi
-# Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
# Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
-icu_config="$icu_config --disable-strict --disable-dyload --disable-layout"
+icu_config="$icu_config --disable-dyload --disable-layout"
+# Add '--disable-strict' but not for solaris: required for MinGW32, otherwise reduce warnings.
if test "x$cross_compiling" = xyes; then
icu_native_args="--build=$build_alias --host=$build_alias --disable-icuio"
+ case $build_os in #(
+ solaris*) :
+ ;; #(
+ *) :
+ icu_native_args="--disable-strict $icu_native_args" ;;
+esac
icu_build_args="--build=$build_alias --host=$host_alias --with-cross-build='\${abs_builddir}'/icu-native"
else
icu_build_args="--build=$kpse_build_alias"
icu_native_args=
fi
+case $host_os in #(
+ solaris*) :
+ ;; #(
+ *) :
+ icu_build_args="--disable-strict $icu_build_args" ;;
+esac
eval "set x $ac_configure_args"
shift
for icu_arg
diff --git a/Build/source/libs/icu/configure.ac b/Build/source/libs/icu/configure.ac
index b4eba9bf49c..ad5e45ffd51 100644
--- a/Build/source/libs/icu/configure.ac
+++ b/Build/source/libs/icu/configure.ac
@@ -34,18 +34,24 @@ icu_config="$icu_config --disable-extras --disable-samples --disable-tests"
if test "x$cache_file" != x/dev/null; then
icu_config="$icu_config -C"
fi
-# Add '--disable-strict': required for MinGW32, otherwise reduce warnings.
# Add '--disable-dyload': neither XeTeX nor BibTeXU use plugins, new in ICU 4.4.
-icu_config="$icu_config --disable-strict --disable-dyload --disable-layout"
+icu_config="$icu_config --disable-dyload --disable-layout"
AC_SUBST([icu_config])
+# Add '--disable-strict' but not for solaris: required for MinGW32, otherwise reduce warnings.
if test "x$cross_compiling" = xyes; then
icu_native_args="--build=$build_alias --host=$build_alias --disable-icuio"
+ AS_CASE([$build_os],
+ [solaris*], [],
+ [icu_native_args="--disable-strict $icu_native_args"])
icu_build_args="--build=$build_alias --host=$host_alias --with-cross-build='\${abs_builddir}'/icu-native"
else
icu_build_args="--build=$kpse_build_alias"
icu_native_args=
fi
+AS_CASE([$host_os],
+ [solaris*], [],
+ [icu_build_args="--disable-strict $icu_build_args"])
eval "set x $ac_configure_args"
shift
for icu_arg