Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only add -woff 3970 to C[XX]FLAGS when using SGI mipsPro 7.4.4 or later, previous versions didn't support this warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-08 20:20:57 +00:00
parent a599423672
commit bd33fd3e22
2 changed files with 251 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

272
configure vendored
View File

@@ -13763,17 +13763,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER" >&6; }
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
:; INTELCC=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
:; INTELCC=yes
else
:;
fi
if test "x$GCC" != "xyes"; then
@@ -14274,17 +14274,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" >&6; }
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
:; SGICC=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
:; SGICC=yes
else
:;
fi
;;
@@ -14354,17 +14354,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___HP_cc" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler___HP_cc" >&6; }
if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
:; HPCC=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___HP_cc" = "xyes"; then
:; HPCC=yes
else
:;
fi
;;
@@ -14434,17 +14434,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___DECC" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler___DECC" >&6; }
if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
:; COMPAQCC=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___DECC" = "xyes"; then
:; COMPAQCC=yes
else
:;
fi
;;
@@ -14514,17 +14514,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___SUNPRO_C" >&5
echo "${ECHO_T}$bakefile_cv_c_compiler___SUNPRO_C" >&6; }
if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
:; SUNCC=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___SUNPRO_C" = "xyes"; then
:; SUNCC=yes
else
:;
fi
;;
@@ -15409,17 +15409,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
:; INTELCXX=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___INTEL_COMPILER" = "xyes"; then
:; INTELCXX=yes
else
:;
fi
if test "x$GCXX" != "xyes"; then
@@ -15920,17 +15920,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" >&6; }
if test "x$bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION" = "xyes"; then
:; SGICXX=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler__SGI_COMPILER_VERSION" = "xyes"; then
:; SGICXX=yes
else
:;
fi
;;
@@ -16000,17 +16000,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___HP_aCC" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler___HP_aCC" >&6; }
if test "x$bakefile_cv_cxx_compiler___HP_aCC" = "xyes"; then
:; HPCXX=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___HP_aCC" = "xyes"; then
:; HPCXX=yes
else
:;
fi
;;
@@ -16080,17 +16080,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___DECCXX" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler___DECCXX" >&6; }
if test "x$bakefile_cv_cxx_compiler___DECCXX" = "xyes"; then
:; COMPAQCXX=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___DECCXX" = "xyes"; then
:; COMPAQCXX=yes
else
:;
fi
;;
@@ -16160,17 +16160,17 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___SUNPRO_CC" >&5
echo "${ECHO_T}$bakefile_cv_cxx_compiler___SUNPRO_CC" >&6; }
if test "x$bakefile_cv_cxx_compiler___SUNPRO_CC" = "xyes"; then
:; SUNCXX=yes
else
:;
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$bakefile_cv_c_compiler___SUNPRO_CC" = "xyes"; then
:; SUNCXX=yes
else
:;
fi
;;
@@ -23621,10 +23621,142 @@ if test "x$SUNCC" = xyes; then
fi
if test "x$SGICC" = "xyes"; then
CFLAGS="-woff 3970 $CFLAGS"
{ echo "$as_me:$LINENO: checking if cc version is 7.4.4 or greater" >&5
echo $ECHO_N "checking if cc version is 7.4.4 or greater... $ECHO_C" >&6; }
if test "${wx_cv_prog_sgicc744+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
#if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_prog_sgicc744=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_prog_sgicc744=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5
echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; }
if test "x$wx_cv_prog_sgicc744" = "xyes"; then
CFLAGS="-woff 3970 $CFLAGS"
fi
fi
if test "x$SGICXX" = "xyes"; then
CXXFLAGS="-woff 3970 $CXXFLAGS"
{ echo "$as_me:$LINENO: checking if CC version is 7.4.4 or greater" >&5
echo $ECHO_N "checking if CC version is 7.4.4 or greater... $ECHO_C" >&6; }
if test "${wx_cv_prog_sgicxx744+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
#if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_prog_sgicxx744=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
wx_cv_prog_sgicxx744=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicxx744" >&5
echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&6; }
if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
CXXFLAGS="-woff 3970 $CXXFLAGS"
fi
fi
if test "x$HPCC" = "xyes"; then
@@ -44779,22 +44911,18 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_PM" = 1 \
-o "$wxUSE_DFB" = 1; then
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported on this platform... disabled" >&5
echo "$as_me: WARNING: Popup window not yet supported on this platform... disabled" >&2;}
else
if test "$wxUSE_PM" = 1; then
{ echo "$as_me:$LINENO: WARNING: wxPopupWindow not yet supported under PM... disabled" >&5
echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" >&2;}
else
cat >>confdefs.h <<\_ACEOF
cat >>confdefs.h <<\_ACEOF
#define wxUSE_POPUPWIN 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
USES_CONTROLS=1
fi
USES_CONTROLS=1
fi
fi
@@ -46153,9 +46281,13 @@ fi
if test "x$SUNCXX" = "xyes"; then
AR=${AR:-"$CXX"}
AR=$CXX
AROPTIONS="-xar -o"
elif test "x$SGICC" = "xyes"; then
AR=$CXX
AROPTIONS="-ar -o"
AROPTIONS=${AROPTIONS:-"-xar -o"}
else
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
@@ -46551,10 +46683,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; }
PLATFORM_BEOS=1
;;
* )
{ { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
{ (exit 1); exit 1; }; }
;;
;;
esac
fi
@@ -47517,7 +47646,10 @@ EOF
;;
*)
esac
{ { echo "$as_me:$LINENO: error: unknown system type $BAKEFILE_HOST." >&5
echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;}
{ (exit 1); exit 1; }; }
esac
if test "x$PIC_FLAG" != "x" ; then
PIC_FLAG="$PIC_FLAG -DPIC"

64
configure.in
View File

@@ -2102,18 +2102,55 @@ if test "x$SUNCC" = xyes; then
CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS"
fi
dnl SGI mipsPro compiler gives this warning for "conversion from pointer to
dnl same-sized integral type" even when there is an explicit cast and as there
dnl is no way to turn it off and there are hundreds of these warnings in wx
dnl sources, just turn it off for now
dnl SGI mipsPro compiler version 7.4.4 and later (and maybe some earlier
dnl versions too but it's known that 7.4 doesn't give this warning) gives this
dnl warning for "conversion from pointer to same-sized integral type" even when
dnl there is an explicit cast and as there is no way to turn it off and there
dnl are hundreds of these warnings in wx sources, just turn it off for now
dnl
dnl a better long term solution would be to use #pragma set/reset woff in
dnl wxPtrToUInt() and use it instead of casts elsewhere
if test "x$SGICC" = "xyes"; then
CFLAGS="-woff 3970 $CFLAGS"
AC_CACHE_CHECK([if cc version is 7.4.4 or greater],
wx_cv_prog_sgicc744,
[
AC_TRY_COMPILE([],
[
#if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later
#endif
],
wx_cv_prog_sgicc744=no,
wx_cv_prog_sgicc744=yes
)
]
)
if test "x$wx_cv_prog_sgicc744" = "xyes"; then
CFLAGS="-woff 3970 $CFLAGS"
fi
fi
if test "x$SGICXX" = "xyes"; then
CXXFLAGS="-woff 3970 $CXXFLAGS"
AC_CACHE_CHECK([if CC version is 7.4.4 or greater],
wx_cv_prog_sgicxx744,
[
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([],
[
#if _SGI_COMPILER_VERSION >= 744
chock me: mipsPro is 7.4.4 or later
#endif
],
wx_cv_prog_sgicxx744=no,
wx_cv_prog_sgicxx744=yes
)
AC_LANG_POP()
]
)
if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
CXXFLAGS="-woff 3970 $CXXFLAGS"
fi
fi
dnl HP-UX c89/aCC compiler warnings
@@ -7024,17 +7061,14 @@ if test "$wxUSE_TREECTRL" = "yes"; then
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_PM" = 1 \
-o "$wxUSE_DFB" = 1; then
AC_MSG_WARN([Popup window not yet supported on this platform... disabled])
else
if test "$wxUSE_PM" = 1; then
AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
else
AC_DEFINE(wxUSE_POPUPWIN)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
AC_DEFINE(wxUSE_POPUPWIN)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
USES_CONTROLS=1
fi
USES_CONTROLS=1
fi
fi