configure.ac | 33 +++++++--------------------------
1 file changed, 7 insertions(+), 26 deletions(-)
New commits:
commit db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac
Author: Douglas Mencken <dougmenc...@gmail.com>
Date: Wed Apr 2 09:45:09 2014 -0400
configure.ac: require g++ 4.1 or above
it's known that GCC 4.0 is unable to build LibreOffice;
also remove check for "a buggy version of g++ (3.4.x)"
Change-Id: I97a030c4a214033cab13a69b4c4a599970f9e1cd
Reviewed-on: https://gerrit.libreoffice.org/8812
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 3bd4575..cebff52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5387,40 +5387,21 @@ else
fi
fi
-dnl check if we are using a buggy version of g++ (currently 3.4.0, 3.4.1 and
trunk)
+dnl check for GNU C++ compiler version
if test "$GXX" = "yes"; then
AC_MSG_CHECKING([the GNU C++ compiler version])
_gpp_version=`$CXX -dumpversion`
_gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'`
- AC_MSG_RESULT([checked (g++ $_gpp_version)])
-
- if test "$_gpp_majmin" = "304"; then
- AC_MSG_CHECKING([whether $CXX has the enum bug])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- extern "C" void abort (void);
- extern "C" void exit (int status);
-
- enum E { E0, E1, E2, E3, E4, E5 };
-
- void test (enum E e)
- {
- if (e == E2 || e == E3 || e == E1)
- exit (1);
- }
-
- int main (void)
- {
- test (E4);
- test (E5);
- test (E0);
- return 0;
- }
- ]])],[AC_MSG_ERROR([your version of the GNU C++ compile has a bug
which prevents LibreOffice from being compiled correctly - please check
http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for
details.])],[AC_MSG_RESULT([no])],[])
+ if test "$_gpp_majmin" -lt "410"; then
+ AC_MSG_ERROR([You need to use GNU C++ compiler version >= 4.1 to build
LibreOffice.])
+ else
+ AC_MSG_RESULT([checked (g++ $_gpp_version)])
fi
+
dnl see https://code.google.com/p/android/issues/detail?id=41770
- if test "$_gpp_majmin" -ge "407"; then
+ if test "$_gpp_majmin" -ge "410"; then
glibcxx_threads=no
AC_LANG_PUSH([C++])
AC_REQUIRE_CPP
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
