From 9a18f09b1778433ced2710316e7749081d3825d2 Mon Sep 17 00:00:00 2001 From: Randell Jesup Date: Thu, 1 May 2014 03:05:14 -0400 Subject: [PATCH] Backout d26d6aab28da (bug 1003702) for breaking everything --- intl/icu-patches/suppress-warnings.diff | 80 ------------------------- intl/icu/source/acinclude.m4 | 6 -- intl/icu/source/configure | 6 -- intl/update-icu.sh | 1 - 4 files changed, 93 deletions(-) delete mode 100644 intl/icu-patches/suppress-warnings.diff diff --git a/intl/icu-patches/suppress-warnings.diff b/intl/icu-patches/suppress-warnings.diff deleted file mode 100644 index 65eef53a975e..000000000000 --- a/intl/icu-patches/suppress-warnings.diff +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/intl/icu/source/acinclude.m4 b/intl/icu/source/acinclude.m4 ---- a/intl/icu/source/acinclude.m4 -+++ b/intl/icu/source/acinclude.m4 -@@ -466,30 +466,36 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE], - *) - # Do not use -ansi. It limits us to C90, and it breaks some platforms. - # We use -std=c99 to disable the gnu99 defaults and its associated warnings - CFLAGS="$CFLAGS -std=c99" - ;; - esac - - CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" -+ -+ # Suppress clang C warnings: -+ CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused" - else - case "${host}" in - *-*-cygwin) - if test "`$CC /help 2>&1 | head -c9`" = "Microsoft" - then - CFLAGS="$CFLAGS /W4" - fi ;; - *-*-mingw32|*-*-mingw64) - CFLAGS="$CFLAGS -W4" ;; - esac - fi - if test "$GXX" = yes - then - CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" -+ -+ # Suppress clang C++ warnings: -+ CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter" - else - case "${host}" in - *-*-cygwin) - if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft" - then - CXXFLAGS="$CXXFLAGS /W4" - fi ;; - *-*-mingw32|*-*-mingw64) -diff --git a/intl/icu/source/configure b/intl/icu/source/configure ---- a/intl/icu/source/configure -+++ b/intl/icu/source/configure -@@ -4089,30 +4089,36 @@ fi - *) - # Do not use -ansi. It limits us to C90, and it breaks some platforms. - # We use -std=c99 to disable the gnu99 defaults and its associated warnings - CFLAGS="$CFLAGS -std=c99" - ;; - esac - - CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" -+ -+ # Suppress clang C warnings: -+ CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused" - else - case "${host}" in - *-*-cygwin) - if test "`$CC /help 2>&1 | head -c9`" = "Microsoft" - then - CFLAGS="$CFLAGS /W4" - fi ;; - *-*-mingw32|*-*-mingw64) - CFLAGS="$CFLAGS -W4" ;; - esac - fi - if test "$GXX" = yes - then - CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" -+ -+ # Suppress clang C++ warnings: -+ CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter" - else - case "${host}" in - *-*-cygwin) - if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft" - then - CXXFLAGS="$CXXFLAGS /W4" - fi ;; - *-*-mingw32|*-*-mingw64) diff --git a/intl/icu/source/acinclude.m4 b/intl/icu/source/acinclude.m4 index 560fce8cf2cd..1b234efa558f 100644 --- a/intl/icu/source/acinclude.m4 +++ b/intl/icu/source/acinclude.m4 @@ -471,9 +471,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE], esac CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" - - # Suppress clang C warnings: - CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused" else case "${host}" in *-*-cygwin) @@ -488,9 +485,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE], if test "$GXX" = yes then CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" - - # Suppress clang C++ warnings: - CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter" else case "${host}" in *-*-cygwin) diff --git a/intl/icu/source/configure b/intl/icu/source/configure index 022f2682c3e1..8b2a96d7572a 100755 --- a/intl/icu/source/configure +++ b/intl/icu/source/configure @@ -4094,9 +4094,6 @@ $as_echo "$ac_use_strict_options" >&6; } esac CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" - - # Suppress clang C warnings: - CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused" else case "${host}" in *-*-cygwin) @@ -4111,9 +4108,6 @@ $as_echo "$ac_use_strict_options" >&6; } if test "$GXX" = yes then CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" - - # Suppress clang C++ warnings: - CXXFLAGS="$CXXFLAGS -Wno-unused -Wno-unused-parameter" else case "${host}" in *-*-cygwin) diff --git a/intl/update-icu.sh b/intl/update-icu.sh index 7d4d751b69f3..6ede56835fd4 100755 --- a/intl/update-icu.sh +++ b/intl/update-icu.sh @@ -55,6 +55,5 @@ patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-899722-4 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-915735 patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/genrb-omitCollationRules.diff patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/qualify-uinitonce-windows.diff -patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/suppress-warnings.diff hg addremove ${icu_dir}