You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/03/18 16:25:18 UTC
[1/2] mesos git commit: Fixed Python build breakage.
Repository: mesos
Updated Branches:
refs/heads/master e376d3aa0 -> 31e315cf2
Fixed Python build breakage.
Commit cf2ba377e95f8 vendored a more recent upstream version of the
AX_CXX_COMPILE_STDCXX m4 macro. This new version changed behavior: the
old version updated $CXXFLAGS to add the flags necessary to enable
C++11 mode, while the new version updated $CXX.
Updating $CXX mostly works fine, except that for some reason Python's
distutils uses $CC to compile C++ source files for a native Python
extension. There's already a hack in `configure.ac` to add $CXXFLAGS
to $CFLAGS to workaround this, but the hack stopped working when we
stopped adding the C++ dialect flag to $CXXFLAGS.
For now, revert the m4 macro to update $CXXFLAGS instead of $CXX; in
the future, it might also be worth looking into whether there's a way
to convince distutils to be more sane.
Review: https://reviews.apache.org/r/45016/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/632421d2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/632421d2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/632421d2
Branch: refs/heads/master
Commit: 632421d2fbf4ee9ccdd8e5fdaac8d05ec29d078c
Parents: e376d3a
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 18 08:15:21 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Mar 18 08:24:40 2016 -0700
----------------------------------------------------------------------
configure.ac | 2 +-
m4/ax_cxx_compile_stdcxx.m4 | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/632421d2/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a31f154..9ec4bc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -570,7 +570,7 @@ AS_CASE($ax_cv_cxx_compiler_vendor,
)
# Ensure that CXX supports C++11 (with "strict" conformance), and set
-# "--std=" flag and CXX environment variable as appropriate.
+# "--std=" flag and CXXFLAGS environment variable as appropriate.
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
# Blacklist known incompatible C++ standard libraries to reduce chance
http://git-wip-us.apache.org/repos/asf/mesos/blob/632421d2/m4/ax_cxx_compile_stdcxx.m4
----------------------------------------------------------------------
diff --git a/m4/ax_cxx_compile_stdcxx.m4 b/m4/ax_cxx_compile_stdcxx.m4
index fa54631..0460bcd 100644
--- a/m4/ax_cxx_compile_stdcxx.m4
+++ b/m4/ax_cxx_compile_stdcxx.m4
@@ -74,14 +74,14 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
+ CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi
@@ -100,14 +100,14 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
+ CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi
[2/2] mesos git commit: Updated C++ dialect macro in libprocess.
Posted by jo...@apache.org.
Updated C++ dialect macro in libprocess.
This keeps the macro consistent with the recent changes to the
Mesos version of this file.
Review: https://reviews.apache.org/r/45017/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/31e315cf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/31e315cf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/31e315cf
Branch: refs/heads/master
Commit: 31e315cf201ffe2dac26dbf5a18512791e83996c
Parents: 632421d
Author: Neil Conway <ne...@gmail.com>
Authored: Fri Mar 18 08:15:29 2016 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Fri Mar 18 08:24:58 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 2 +-
3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4 | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/31e315cf/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index c3a9d7d..d27e46e 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -778,7 +778,7 @@ AS_CASE($ax_cv_cxx_compiler_vendor,
)
# Ensure that the build environment supports C++11 (with "strict" conformance),
-# and set "--std=" flag and CXX environment variable as appropriate.
+# and set "--std=" flag and CXXFLAGS environment variable as appropriate.
AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
# Blacklist known incompatible C++ standard libraries to reduce chance
http://git-wip-us.apache.org/repos/asf/mesos/blob/31e315cf/3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4 b/3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4
index fa54631..0460bcd 100644
--- a/3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4
+++ b/3rdparty/libprocess/m4/ax_cxx_compile_stdcxx.m4
@@ -74,14 +74,14 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
+ CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi
@@ -100,14 +100,14 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
$cachevar,
- [ac_save_CXX="$CXX"
- CXX="$CXX $switch"
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
[eval $cachevar=yes],
[eval $cachevar=no])
- CXX="$ac_save_CXX"])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
if eval test x\$$cachevar = xyes; then
- CXX="$CXX $switch"
+ CXXFLAGS="$CXXFLAGS $switch"
ac_success=yes
break
fi