anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Require gcc 4.6

Browse Source 
See also 5de30b1210
This commit is contained in:
Georg Baum 2016-06-15 22:04:51 +02:00
parent c76e0f1153
commit e307944d18
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -272,8 +272,8 @@ if(UNIX OR MINGW)
execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Using GCC version ${GCC_VERSION}") message(STATUS "Using GCC version ${GCC_VERSION}")
if(GCC_VERSION VERSION_LESS 4.9) if(GCC_VERSION VERSION_LESS 4.9)
if(GCC_VERSION VERSION_LESS 4.3) if(GCC_VERSION VERSION_LESS 4.6)
message(FATAL_ERROR "gcc >= 4.3 is required.") message(FATAL_ERROR "gcc >= 4.6 is required.")
endif() endif()
# <regex> in gcc is unusable in versions less than 4.9.0 # <regex> in gcc is unusable in versions less than 4.9.0
# see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631

2
INSTALL
View File

@ -49,7 +49,7 @@ Requirements
First of all, you will need a recent C++ compiler, where recent means First of all, you will need a recent C++ compiler, where recent means
that the compilers are close to C++11 standard conforming like gcc (at that the compilers are close to C++11 standard conforming like gcc (at
least 4.3) or clang. least 4.6) or clang.
LyX makes great use of the C++ Standard Template Library (STL). LyX makes great use of the C++ Standard Template Library (STL).
This means that gcc users will have to install the relevant libstdc++ This means that gcc users will have to install the relevant libstdc++

8
config/lyxinclude.m4
View File

@ -209,7 +209,7 @@ AC_DEFUN([LYX_CXX_USE_REGEX],
dnl <regex> in gcc is unusable in versions less than 4.9.0 dnl <regex> in gcc is unusable in versions less than 4.9.0
dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 dnl see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
case $gxx_version in case $gxx_version in
4.3*|4.4*|4.5*|4.6*|4.7*|4.8*) lyx_std_regex=no ;; 4.6*|4.7*|4.8*) lyx_std_regex=no ;;
*) ;; *) ;;
esac esac
fi fi
@ -355,8 +355,8 @@ if test x$GXX = xyes; then
AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra" AM_CPPFLAGS="$AM_CPPFLAGS -Wall -Wextra"
fi fi
case $gxx_version in case $gxx_version in
2.*|3.*) AC_ERROR([gcc >= 4.3 is required]);; 2.*|3.*) AC_ERROR([gcc >= 4.6 is required]);;
4.0*|4.1*|4.2*) AC_ERROR([gcc >= 4.3 is required]);; 4.0*|4.1*|4.2*|4.3*|4.4*|4.5*) AC_ERROR([gcc >= 4.6 is required]);;
esac esac
if test x$enable_stdlib_debug = xyes ; then if test x$enable_stdlib_debug = xyes ; then
dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0
@ -370,7 +370,7 @@ if test x$GXX = xyes; then
esac esac
fi fi
case $gxx_version in case $gxx_version in
4.3*|4.4*|4.5*|4.6*) 4.6*)
dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__. dnl Note that this will define __GXX_EXPERIMENTAL_CXX0X__.
dnl The source code relies on that. dnl The source code relies on that.
cxx11_flags="-std=c++0x";; cxx11_flags="-std=c++0x";;