Jean-Marc Lasgouttes wrote:
> Le 10/05/2015 10:24, Georg Baum a écrit :
>> Richard Heck wrote:
>>
>>> This is fine for branch if the people who understand this stuff (not me)
>>> think it is.
>>
>> Jean-Marc, Kornel, do I have your OK?
>
> I cannot test it (or I am too lazy to see whether I can install gcc 5),
> but it looks good.
I am lazy too, but when gcc 4.1 was new I used to compile gcc on a regular
basis, and the script from that time does still work (including getting the
sources from svn), so it was not much work.
> Did we already backport the other related things to
> branch?
Sorry, I should have tried before asking. Of course there were not all
needed backports done yet. The attached version is the minimal I could find.
I had include the removal of LYX_PROG_CXX_WORKS, otherwise autoconf would
complain about expanding a macro before requiring it:
http://www.gnu.org/software/autoconf/manual/autoconf.html#Expanded-Before-Required
I tested the automake part with clang 3.5, gcc 4.9 and gcc 5.1. cmake was
only tested with gcc 4.9 (since it is moee similar to master)
Still OK?
Georg
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 61ea48d..a0094c1 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -120,37 +120,65 @@ done
])dnl
-AC_DEFUN([LYX_PROG_CXX_WORKS],
-[rm -f conftest.C
-cat >conftest.C <<EOF
-class foo {
- // we require the mutable keyword
- mutable int bar;
- };
- // we require namespace support
- namespace baz {
- int bar;
- }
- int main() {
- return(0);
- }
-EOF
-$CXX -c $CXXFLAGS $CPPFLAGS conftest.C >&5 || CXX=
-rm -f conftest.C conftest.o conftest.obj || true
+dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_clang to yes if the compiler is clang.
+AC_DEFUN([LYX_PROG_CLANG],
+[AC_CACHE_CHECK([whether the compiler is clang],
+ [lyx_cv_prog_clang],
+[AC_TRY_COMPILE([], [
+#ifndef __clang__
+ this is not clang
+#endif
+],
+[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])])
])
-AC_DEFUN([LYX_PROG_CXX],
-[AC_MSG_CHECKING([for a good enough C++ compiler])
-LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS])
+dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++.
+AC_DEFUN([LYX_LIB_STDCXX],
+[AC_CACHE_CHECK([whether STL is libstdc++],
+ [lyx_cv_lib_stdcxx],
+[AC_TRY_COMPILE([#include<vector>], [
+#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
+ this is not libstdc++
+#endif
+],
+[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])])
+])
-if test -z "$CXX" ; then
- AC_MSG_ERROR([Unable to find a good enough C++ compiler])
-fi
-AC_MSG_RESULT($CXX)
-AC_PROG_CXX
-AC_PROG_CXXCPP
+dnl Usage: LYX_LIB_STDCXX_CXX11_ABI: set lyx_cv_lib_stdcxx_cxx11_abi to yes
+dnl if the STL library is GNU libstdc++ and the C++11 ABI is used.
+AC_DEFUN([LYX_LIB_STDCXX_CXX11_ABI],
+[AC_CACHE_CHECK([whether STL is libstdc++ using the C++11 ABI],
+ [lyx_cv_lib_stdcxx_cxx11_abi],
+[AC_TRY_COMPILE([#include<vector>], [
+#if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI
+ this is not libstdc++ using the C++11 ABI
+#endif
+],
+[lyx_cv_lib_stdcxx_cxx11_abi=yes], [lyx_cv_lib_stdcxx_cxx11_abi=no])])
+])
+
+
+AC_DEFUN([LYX_PROG_CXX],
+[AC_REQUIRE([AC_PROG_CXX])
+AC_REQUIRE([AC_PROG_CXXCPP])
+
+AC_LANG_PUSH(C++)
+LYX_PROG_CLANG
+LYX_LIB_STDCXX
+LYX_LIB_STDCXX_CXX11_ABI
+AC_LANG_POP(C++)
+
+if test $lyx_cv_lib_stdcxx = "yes" ; then
+ if test $lyx_cv_lib_stdcxx_cxx11_abi = "yes" ; then
+ AC_DEFINE(USE_GLIBCXX_CXX11_ABI, 1, [use GNU libstdc++ with C++11 ABI])
+ fi
+else
+ if test $lyx_cv_prog_clang = "yes" ; then
+ AC_DEFINE(USE_LLVM_LIBCPP, 1, [use libc++ provided by llvm instead of GNU libstdc++])
+ fi
+fi
### We might want to get or shut warnings.
AC_ARG_ENABLE(warnings,
diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 71291a5..a738160 100644
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -112,3 +112,49 @@ check_cxx_source_compiles(
"
SIZEOF_WCHAR_T_IS_4)
+# Check whether STL is libstdc++
+check_cxx_source_compiles(
+ "
+ #include <vector>
+ int main() {
+ #if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
+ this is not libstdc++
+ #endif
+ return(0);
+ }
+ "
+lyx_cv_lib_stdcxx)
+
+# Check whether STL is libstdc++ with C++11 ABI
+check_cxx_source_compiles(
+ "
+ #include <vector>
+ int main() {
+ #if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI
+ this is not libstdc++ using the C++11 ABI
+ #endif
+ return(0);
+ }
+ "
+USE_GLIBCXX_CXX11_ABI)
+
+check_cxx_source_compiles(
+ "
+ #ifndef __clang__
+ this is not clang
+ #endif
+ int main() {
+ return(0);
+ }
+ "
+lyx_cv_prog_clang)
+
+set(USE_LLVM_LIBCPP)
+set(USE_GLIBCXX_CXX11_ABI)
+if(NOT lyx_cv_lib_stdcxx)
+ if(lyx_cv_prog_clang)
+ # use libc++ provided by llvm instead of GNU libstdc++
+ set(USE_LLVM_LIBCPP 1)
+ endif()
+endif()
+
diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 7bbe09e..a392b51 100644
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -57,6 +57,9 @@
#cmakedefine LYX_USE_TR1 1
#cmakedefine LYX_USE_TR1_REGEX 1
+// use GNU libstdc++ with C++11 ABI
+#cmakedefine USE_GLIBCXX_CXX11_ABI 1
+
#cmakedefine Z_PREFIX 1
#cmakedefine ASPELL_FOUND 1
diff --git a/src/support/strfwd.h b/src/support/strfwd.h
index de8588c..f39426e 100644
--- a/src/support/strfwd.h
+++ b/src/support/strfwd.h
@@ -13,14 +13,6 @@
#ifndef STRFWD_H
#define STRFWD_H
-// This includes does nothing but defining _LIBCPP_VERSION
-// if libc++ is used (rather than libstdc++) - we first
-// check if we have at least a c++03 standard before
-// including the file
-#if (__cplusplus > 19971L)
-#include <ciso646>
-#endif
-
#ifdef USE_WCHAR_T
// Prefer this if possible because GNU libstdc++ has usable
@@ -36,8 +28,10 @@ namespace lyx { typedef boost::uint32_t char_type; }
#endif
-// Forward definitions do not work with libc++
-#ifdef _LIBCPP_VERSION
+// For gcc5 with the new std::string ABI forward declarations would work in
+// principle, but I am not sure whether we want non-standard
+// "namespace __cxx11" in our sources.
+#if defined(USE_LLVM_LIBCPP) || defined(USE_GLIBCXX_CXX11_ABI)
#include <string>
#else
