From e856d6846bce5402cc79f7bbaa59897690080017 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Sat, 25 Apr 2015 17:53:28 +0200 Subject: THRIFT-3113 m4 C++11 macro issue Make it cross-compile happy the hard way, there's no clean way. Make zlib version detection cross-compile happy. Signed-off-by: Gustavo Zacarias Signed-off-by: Romain Naour autotools: update ax_cxx_compile_stdcxx_11.m4 to version 10 The ax_cxx_compile_stdcxx_11 macro bundled in thrift package is brocken [1] and out of date. Since Thrift actually doesn't use that particular C++11 feature, make C++11 support optional. [1] https://savannah.gnu.org/patch/index.php?8287 Fixes: [thrift] http://autobuild.buildroot.net/results/21e/21e3fff1e0d714f94ac7e621289d1a59bc02a05f/build-end.log [host-thrift] http://autobuild.buildroot.net/results/b89/b89ffc2bff699eb10bb6abd92369a43d4900354d/build-end.log Signed-off-by: Romain Naour This closes: #462 --- aclocal/ax_cxx_compile_stdcxx_11.m4 | 45 +++++++++++++++++++++++++++++++------ aclocal/ax_lib_event.m4 | 2 +- aclocal/ax_lib_zlib.m4 | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) (limited to 'aclocal') diff --git a/aclocal/ax_cxx_compile_stdcxx_11.m4 b/aclocal/ax_cxx_compile_stdcxx_11.m4 index a4c9189c9..a9a8f584f 100644 --- a/aclocal/ax_cxx_compile_stdcxx_11.m4 +++ b/aclocal/ax_cxx_compile_stdcxx_11.m4 @@ -27,21 +27,29 @@ # Copyright (c) 2008 Benjamin Kosnik # Copyright (c) 2012 Zack Weinberg # Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 3 +#serial 10 -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ +m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ template struct check { static_assert(sizeof(int) <= sizeof(T), "not big enough"); }; + struct Base { + virtual void f() {} + }; + struct Child : public Base { + virtual void f() override {} + }; + typedef check> right_angle_brackets; int a; @@ -52,7 +60,31 @@ m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [ check_type&& cr = static_cast(c); auto d = a; -]) + auto l = [](){}; + // Prevent Clang error: unused variable 'l' [-Werror,-Wunused-variable] + struct use_l { use_l() { l(); } }; + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function because of this + namespace test_template_alias_sfinae { + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { + func(0); + } + } +]]) AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$1], [], [], @@ -62,7 +94,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], [$2], [optional], [ax_cxx_compile_cxx11_required=false], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) AC_LANG_PUSH([C++])dnl ac_success=no AC_CACHE_CHECK(whether $CXX supports C++11 features by default, @@ -76,7 +108,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$1], [noext], [], [dnl if test x$ac_success = xno; then - for switch in -std=gnu++11; do + for switch in -std=gnu++11 -std=gnu++0x; do cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, $cachevar, @@ -96,7 +128,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl m4_if([$1], [ext], [], [dnl if test x$ac_success = xno; then - for switch in -std=c++11; do + for switch in -std=c++11 -std=c++0x; do cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, $cachevar, @@ -131,4 +163,3 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl AC_SUBST(HAVE_CXX11) fi ]) - diff --git a/aclocal/ax_lib_event.m4 b/aclocal/ax_lib_event.m4 index cf6c4c2d5..d4dcdc9a6 100644 --- a/aclocal/ax_lib_event.m4 +++ b/aclocal/ax_lib_event.m4 @@ -75,7 +75,7 @@ AC_DEFUN([AX_LIB_EVENT_DO_CHECK], AC_LANG_PUSH([C]) dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling, dnl but then the version cannot be checked. - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include ]], [[ diff --git a/aclocal/ax_lib_zlib.m4 b/aclocal/ax_lib_zlib.m4 index 8c10ab413..bdb9e110e 100644 --- a/aclocal/ax_lib_zlib.m4 +++ b/aclocal/ax_lib_zlib.m4 @@ -73,7 +73,7 @@ AC_DEFUN([AX_LIB_ZLIB_DO_CHECK], # (defined in the library). AC_LANG_PUSH([C]) dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling. - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #if ZLIB_VERNUM >= 0x$WANT_ZLIB_VERSION #else -- cgit v1.2.1