mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1003702 - Suppress clang warnings in third-party code: ICU. Now with more clobberin'. r=glandium
--HG-- extra : amend_source : 8fff21a02daafc582a458887fd55ad6c0eb3e97a
This commit is contained in:
Chris Peterson
parent
a36d33facc
commit
cdc1423478
4
CLOBBER
4
CLOBBER
@ -1,4 +1,4 @@
|
||||
# To Trigger a clobber replace ALL of the textual description below,
|
||||
# To trigger a clobber replace ALL of the textual description below,
|
||||
# giving a bug number and a one line description of why a clobber is
|
||||
# required. Modifying this file will make configure check that a
|
||||
# clobber has been performed before the build can continue.
|
||||
@ -22,4 +22,4 @@
|
||||
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
|
||||
# don't change CLOBBER for WebIDL changes any more.
|
||||
|
||||
Bug 1003702 - ICU is unhappy.
|
||||
Bug 1003702 - Relanding ICU changes with a clobber
|
||||
|
||||
80
intl/icu-patches/suppress-warnings.diff
Normal file
80
intl/icu-patches/suppress-warnings.diff
Normal file
@ -0,0 +1,80 @@
|
||||
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)
|
||||
@ -471,6 +471,9 @@ 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)
|
||||
@ -485,6 +488,9 @@ 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)
|
||||
|
||||
6
intl/icu/source/configure
vendored
6
intl/icu/source/configure
vendored
@ -4094,6 +4094,9 @@ $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)
|
||||
@ -4108,6 +4111,9 @@ $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)
|
||||
|
||||
@ -55,5 +55,6 @@ 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}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user