You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2018/01/25 15:56:13 UTC

[3/3] mesos git commit: Reverted usage of the -isystem flag for includes in stout.

Reverted usage of the -isystem flag for includes in stout.

This flag break the build of mesos against system libraries
installed under /usr, because it generates a command line
of `-isystem /usr/include`, which is explicitly not supported
by gcc. See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129

Review: https://reviews.apache.org/r/65290/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e932ed59
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e932ed59
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e932ed59

Branch: refs/heads/master
Commit: e932ed591e74ce3570753375f28f063552331bfe
Parents: 069b466
Author: Benno Evers <be...@mesosphere.com>
Authored: Thu Jan 25 11:23:02 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Jan 25 16:18:10 2018 +0100

----------------------------------------------------------------------
 3rdparty/stout/Makefile.am  | 5 +----
 3rdparty/stout/configure.ac | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e932ed59/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index 313e4fe..ef22a02 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -64,11 +64,8 @@ BUNDLED_DEPS = # Initialize BUNDLED_DEPS so we can add to it.
 %-stamp:
 	@cd $(BUNDLED_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@:$(BUNDLED_DIR)/%=%)
 
-# We use "-isystem" instead of "-I" to add Boost to the include search
-# path. This disables compiler warnings inside Boost headers since we
-# can't easily fix them. See MESOS-3799.
 if WITH_BUNDLED_BOOST
-BOOST_INCLUDE_FLAGS = -isystem $(BOOST)
+BOOST_INCLUDE_FLAGS = -I$(BOOST)
 BUNDLED_DEPS += $(BOOST)-stamp
 endif
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/e932ed59/3rdparty/stout/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/stout/configure.ac b/3rdparty/stout/configure.ac
index 6db2287..5a8c023 100644
--- a/3rdparty/stout/configure.ac
+++ b/3rdparty/stout/configure.ac
@@ -280,11 +280,8 @@ libapr-1 is required for stout tests to build.
 ])])
 
 
-# We use "-isystem" instead of "-I" to add Boost to the include search
-# path. This disables compiler warnings inside Boost headers since we
-# can't easily fix them. See MESOS-3799.
 if test -n "`echo $with_boost`"; then
-  CPPFLAGS="$CPPFLAGS -isystem ${with_boost}/include"
+  CPPFLAGS="$CPPFLAGS -I${with_boost}/include"
 fi
 
 # Check if user has asked us to use a preinstalled Boost, or if they