You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ch...@apache.org on 2018/08/31 20:02:33 UTC
[mesos] 03/08: Stout: Used standard macros for appending compile
flags.
This is an automated email from the ASF dual-hosted git repository.
chhsiao pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 1ac74f872b41715504cf4e65c28f42f5091540fd
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
AuthorDate: Thu Aug 30 10:41:15 2018 -0700
Stout: Used standard macros for appending compile flags.
This patch imports the `AX_APPEND_COMPILE_FLAGS` macro and its dependent
`AX_REQUIRE_DEFINED` and `AX_APPEND_FLAG` macros to Autotools, and used
the macro to add `-Wno-unused-local-typedef` for Clang 3.6.
The macros are retrieved from the following repository:
https://git.savannah.gnu.org/git/autoconf-archive.git
The `ax_append_compile_flags.m4` and `ax_required_defined.m4` macros are
retrieved from the HEAD (`4dfd2f8`) at the time; the `ax_append_flag.m4`
macro is retrieved from commit `3e4a839` to support Autoconf 2.59+.
NOTE: CentOS 6 uses Autoconf 2.63 and Ubuntu 14.04 uses 2.59.
Review: https://reviews.apache.org/r/68578
---
3rdparty/stout/configure.ac | 35 ++++----------
3rdparty/stout/m4/ax_append_compile_flags.m4 | 46 +++++++++++++++++++
3rdparty/stout/m4/ax_append_flag.m4 | 69 ++++++++++++++++++++++++++++
3rdparty/stout/m4/ax_require_defined.m4 | 37 +++++++++++++++
4 files changed, 160 insertions(+), 27 deletions(-)
diff --git a/3rdparty/stout/configure.ac b/3rdparty/stout/configure.ac
index 6449686..c996867 100644
--- a/3rdparty/stout/configure.ac
+++ b/3rdparty/stout/configure.ac
@@ -671,30 +671,12 @@ AM_CONDITIONAL([ENABLE_HARDENING], [test x"$enable_hardening" = "xyes"])
AS_CASE($ax_cv_cxx_compiler_vendor,
[clang], [
- # Check if -Wno-unused-local-typedef is needed by checking a sample
- # compilation which contains a local unused typedef.
- # This is needed because Boost 1.53.0 fails to compile with upstream
- # Clang 3.6 without -Wno-unused-local-typedef. Apple LLVM based on
- # Clang 3.6 doesn't have the same behavior.
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE([[
- #pragma clang diagnostic error "-Wunused-local-typedef"
-
- int foo()
- {
- typedef int return_type;
- return 5;
- }
- ]])],
- [warn_local_typedefs=no], [warn_local_typedefs=yes])
- AC_LANG_POP([C++])
-
- if test "x$warn_local_typedefs" = "xyes"; then
- AC_MSG_NOTICE([Disabling warnings about unused local typedefs])
- CXXFLAGS="${CXXFLAGS} -Wno-unused-local-typedef"
- fi
-
+ # Upstream Clang 3.6 emits `-Wunused-local-typedef` warnings when compiling
+ # Boost so we suppress them here. Apple LLVM based on Clang 3.6 doesn't have
+ # the same behavior. See: https://reviews.apache.org/r/32749/
+ # NOTE(chhsiao): Clang 3.6.0 from the link below seems to compile Boost
+ # 1.53.0/1.65.0 just fine: http://releases.llvm.org/download.html#3.6.0
+ AX_APPEND_COMPILE_FLAGS([-Wno-unused-local-typedef], [CXXFLAGS], [-Werror])
], [gnu], [
# Check for GCC version >= 4.8.
AX_COMPARE_VERSION([$ax_cv_cxx_compiler_version], [ge], [4.8],
@@ -705,9 +687,8 @@ AS_CASE($ax_cv_cxx_compiler_vendor,
fi
AC_MSG_NOTICE([Setting up CXXFLAGS for g++ version >= 4.8])
- # Boost 1.53.0 fails to compile with GCC 4.8 without
- # -Wno-unused-local-typedefs, and automake does not recognize the
- # flag.
+ # Boost fails to compile with GCC 4.8+ without `-Wno-unused-local-typedefs`,
+ # and automake does not recognize the flag.
# TODO(brenden): Remove this when Boost has a resolution.
CFLAGS="${CFLAGS} -Wno-unused-local-typedefs"
CXXFLAGS="${CXXFLAGS} -Wno-unused-local-typedefs"
diff --git a/3rdparty/stout/m4/ax_append_compile_flags.m4 b/3rdparty/stout/m4/ax_append_compile_flags.m4
new file mode 100644
index 0000000..9c85635
--- /dev/null
+++ b/3rdparty/stout/m4/ax_append_compile_flags.m4
@@ -0,0 +1,46 @@
+# ============================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+# For every FLAG1, FLAG2 it is checked whether the compiler works with the
+# flag. If it does, the flag is added FLAGS-VARIABLE
+#
+# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+# CFLAGS) is used. During the check the flag is always added to the
+# current language's flags.
+#
+# If EXTRA-FLAGS is defined, it is added to the current language's default
+# flags (e.g. CFLAGS) when the check is done. The check is thus made with
+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
+# force the compiler to issue an error when a bad flag is given.
+#
+# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+# NOTE: This macro depends on the AX_APPEND_FLAG and
+# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
+# AX_APPEND_LINK_FLAGS.
+#
+# LICENSE
+#
+# Copyright (c) 2011 Maarten Bosmans <mk...@gmail.com>
+#
+# 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 7
+
+AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
+[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+ AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
+done
+])dnl AX_APPEND_COMPILE_FLAGS
diff --git a/3rdparty/stout/m4/ax_append_flag.m4 b/3rdparty/stout/m4/ax_append_flag.m4
new file mode 100644
index 0000000..1d38b76
--- /dev/null
+++ b/3rdparty/stout/m4/ax_append_flag.m4
@@ -0,0 +1,69 @@
+# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+# added in between.
+#
+# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains
+# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+# FLAG.
+#
+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Guido U. Draheim <gu...@gmx.de>
+# Copyright (c) 2011 Maarten Bosmans <mk...@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+# Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception, the respective Autoconf Macro's copyright owner
+# gives unlimited permission to copy, distribute and modify the configure
+# scripts that are the output of Autoconf when processing the Macro. You
+# need not follow the terms of the GNU General Public License when using
+# or distributing such scripts, even though portions of the text of the
+# Macro appear in them. The GNU General Public License (GPL) does govern
+# all other use of the material that constitutes the Autoconf Macro.
+#
+# This special exception to the GPL applies to versions of the Autoconf
+# Macro released by the Autoconf Archive. When you make and distribute a
+# modified version of the Autoconf Macro, you may extend this special
+# exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_APPEND_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])dnl
+AS_VAR_SET_IF(FLAGS,
+ [case " AS_VAR_GET(FLAGS) " in
+ *" $1 "*)
+ AC_RUN_LOG([: FLAGS already contains $1])
+ ;;
+ *)
+ AC_RUN_LOG([: FLAGS="$FLAGS $1"])
+ AS_VAR_SET(FLAGS, ["AS_VAR_GET(FLAGS) $1"])
+ ;;
+ esac],
+ [AS_VAR_SET(FLAGS,["$1"])])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG
diff --git a/3rdparty/stout/m4/ax_require_defined.m4 b/3rdparty/stout/m4/ax_require_defined.m4
new file mode 100644
index 0000000..17c3eab
--- /dev/null
+++ b/3rdparty/stout/m4/ax_require_defined.m4
@@ -0,0 +1,37 @@
+# ===========================================================================
+# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+# been defined and thus are available for use. This avoids random issues
+# where a macro isn't expanded. Instead the configure script emits a
+# non-fatal:
+#
+# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+# It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+# Here's an example:
+#
+# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+# Copyright (c) 2014 Mike Frysinger <va...@gentoo.org>
+#
+# 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 2
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+ m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED