Backout d26d6aab28da (
bug 1003702) for breaking everything
deleted file mode 100644
--- 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)
--- a/intl/icu/source/acinclude.m4
+++ b/intl/icu/source/acinclude.m4
@@ -466,36 +466,30 @@ 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)
--- a/intl/icu/source/configure
+++ b/intl/icu/source/configure
@@ -4089,36 +4089,30 @@ 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)
--- a/intl/update-icu.sh
+++ b/intl/update-icu.sh
@@ -50,11 +50,10 @@ rm ${icu_dir}/source/data/translit/*
# the tree.)
svn info $1 | grep -v '^Revision: [[:digit:]]\+$' > ${icu_dir}/SVN-INFO
patch -d ${icu_dir}/../../ -p1 < ${icu_dir}/../icu-patches/bug-724533
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}