Bug 1466471 - Part 1: Update patches for ICU 62. r=Waldo
authorAndré Bargull <andre.bargull@gmail.com>
Fri, 22 Jun 2018 04:39:39 -0700
changeset 480697 289ff944eadceddf973ba0ae68911b26d271ea22
parent 480696 f823c4cfd7ce6908bc57b18a690023efdeeef6ba
child 480698 2ba22d8e422ad2a63ba3a431eb61678bc994a885
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersWaldo
bugs1466471
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1466471 - Part 1: Update patches for ICU 62. r=Waldo
intl/icu-patches/suppress-warnings.diff
--- a/intl/icu-patches/suppress-warnings.diff
+++ b/intl/icu-patches/suppress-warnings.diff
@@ -1,16 +1,16 @@
 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
-@@ -473,30 +473,36 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
+@@ -469,30 +469,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"
+                 # We use -std=c11 to disable the gnu99 defaults and its associated warnings
+                 CFLAGS="$CFLAGS -std=c11"
                  ;;
              esac
              
              CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
 +
 +            # Suppress clang C warnings:
 +            CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
          else
@@ -36,21 +36,21 @@ diff --git a/intl/icu/source/acinclude.m
                  if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
                  then
                      CXXFLAGS="$CXXFLAGS /W4"
                  fi ;;
              *-*-mingw*)
 diff --git a/intl/icu/source/configure b/intl/icu/source/configure
 --- a/intl/icu/source/configure
 +++ b/intl/icu/source/configure
-@@ -4319,30 +4319,36 @@ fi
+@@ -4359,30 +4359,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"
+                 # We use -std=c11 to disable the gnu99 defaults and its associated warnings
+                 CFLAGS="$CFLAGS -std=c11"
                  ;;
              esac
  
              CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
 +
 +            # Suppress clang C warnings:
 +            CFLAGS="$CFLAGS -Wno-sign-compare -Wno-unused"
          else