diff options
| author | Rene Engelhard <rene@debian.org> | 2019-08-30 21:00:55 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-09-03 10:41:12 +0200 |
| commit | 68fee5424f9c149aaabc44952b9a699367a66adf (patch) | |
| tree | b6468a0ad1a0551a8702032f08bf05f58f6d7a8c | |
| parent | assert on selecting text from end to start in shape with a11y enabled (diff) | |
| download | core-68fee5424f9c149aaabc44952b9a699367a66adf.tar.gz core-68fee5424f9c149aaabc44952b9a699367a66adf.zip | |
add -latomic configure check...
...in preparation for <https://gerrit.libreoffice.org/#/c/78380/> "Add -latomic to the end of Linux C++ linker command lines"
(copied from https://github.com/zelcash/zelcash/blob/master/build-aux/m4/l_atomic.m4)
Change-Id: I8879a72d730cc08a72c2d8b132ff9f5d2efe7b9f
Reviewed-on: https://gerrit.libreoffice.org/78336
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 098bf3b243bdbb3257fda97a54caa6c403f63df6)
Reviewed-on: https://gerrit.libreoffice.org/78412
Tested-by: Rene Engelhard <rene@debian.org>
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | m4/l_atomic.m4 | 41 |
3 files changed, 50 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index f639f9d9415b..86aae312339e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -30,6 +30,7 @@ export AR=@AR@ export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@ export ATL_INCLUDE=@ATL_INCLUDE@ export ATL_LIB=@ATL_LIB@ +export ATOMIC_LIB=@ATOMIC_LIB@ export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@ export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@ export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@ diff --git a/configure.ac b/configure.ac index c77ce67f332b..ce0698e845a9 100644 --- a/configure.ac +++ b/configure.ac @@ -6490,6 +6490,14 @@ else fi AC_SUBST(CXXFLAGS_CXX11) +if test "$GCC" = "yes"; then + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $CXXFLAGS_CXX11" + CHECK_L_ATOMIC + CXXFLAGS=$save_CXXFLAGS + AC_SUBST(ATOMIC_LIB) +fi + dnl Test for temporarily incompatible libstdc++ 4.7.{0,1}, where dnl <https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=179528> introduced dnl an additional member _M_size into C++11 std::list towards 4.7.0 and diff --git a/m4/l_atomic.m4 b/m4/l_atomic.m4 new file mode 100644 index 000000000000..6e011ebabe3d --- /dev/null +++ b/m4/l_atomic.m4 @@ -0,0 +1,41 @@ +# Some versions of gcc/libstdc++ require linking with -latomic if +# using the C++ atomic library. +# +# Sourced from http://bugs.debian.org/797228 + +m4_define([_CHECK_L_ATOMIC_testbody], [[ + #include <atomic> + #include <cstdint> + + int main() { + std::atomic<int64_t> a{}; + + int64_t v = 5; + int64_t r = a.fetch_add(v); + return static_cast<int>(r); + } +]]) + +AC_DEFUN([CHECK_L_ATOMIC], [ + + AC_LANG_PUSH(C++) + + AC_MSG_CHECKING([whether std::atomic can be used without link library]) + + AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_L_ATOMIC_testbody])],[ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + LIBS="$LIBS -latomic" + AC_MSG_CHECKING([whether std::atomic needs -latomic]) + AC_LINK_IFELSE([AC_LANG_SOURCE([_CHECK_L_ATOMIC_testbody])],[ + AC_MSG_RESULT([yes]) + ATOMIC_LIB=-latomic + ],[ + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([cannot figure our how to use std::atomic]) + ]) + ]) + + AC_LANG_POP +]) |