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

[bb...@apache.org]

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

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/65289/


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

Branch: refs/heads/master
Commit: 069b466fd1993386febc60e488369936ae731dd6
Parents: 361ed4a
Author: Benno Evers <be...@mesosphere.com>
Authored: Thu Jan 25 11:22:57 2018 +0100
Committer: Benjamin Bannier <bb...@apache.org>
Committed: Thu Jan 25 16:18:08 2018 +0100

----------------------------------------------------------------------
 3rdparty/libprocess/Makefile.am  |  7 ++-----
 3rdparty/libprocess/configure.ac | 18 ++++++------------
 2 files changed, 8 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/069b466f/3rdparty/libprocess/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/Makefile.am b/3rdparty/libprocess/Makefile.am
index ba9e781..3071b7c 100644
--- a/3rdparty/libprocess/Makefile.am
+++ b/3rdparty/libprocess/Makefile.am
@@ -74,12 +74,12 @@ BUNDLED_DEPS = # Initialize BUNDLED_DEPENDENCIES so we can add to it.
 	@cd $(BUNDLED_DIR) && $(MAKE) $(AM_MAKEFLAGS) $(@:$(BUNDLED_DIR)/%=%)
 
 if WITH_BUNDLED_BOOST
-BOOST_INCLUDE_FLAGS = -isystem $(BOOST)
+BOOST_INCLUDE_FLAGS = -I$(BOOST)
 BUNDLED_DEPS += $(BOOST)-stamp
 endif
 
 if WITH_BUNDLED_CONCURRENTQUEUE
-CONCURRENTQUEUE_INCLUDE_FLAGS = -isystem $(CONCURRENTQUEUE)
+CONCURRENTQUEUE_INCLUDE_FLAGS = -I$(CONCURRENTQUEUE)
 BUNDLED_DEPS += $(CONCURRENTQUEUE)-stamp
 endif
 
@@ -235,9 +235,6 @@ libprocess_la_SOURCES +=	\
 endif
 
 
-# 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.
 libprocess_la_CPPFLAGS =			\
   -DBUILD_DIR=\"$(LIBPROCESS_BUILD_DIR)\"	\
   -I$(srcdir)/include				\

http://git-wip-us.apache.org/repos/asf/mesos/blob/069b466f/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index 1069d57..69ec9b9 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -516,11 +516,8 @@ libapr-1 is required for libprocess 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
@@ -552,11 +549,8 @@ fi
 AM_CONDITIONAL([WITH_BUNDLED_BOOST], [test "x$with_bundled_boost" = "xyes"])
 
 
-# We use "-isystem" instead of "-I" to add concurrentqueue to the include
-# search path. This disables compiler warnings inside concurrentqueue
-# headers since we don't own the library.
 if test -n "`echo $with_concurrentqueue`"; then
-  CPPFLAGS="$CPPFLAGS -isystem ${with_concurrentqueue}"
+  CPPFLAGS="$CPPFLAGS -I${with_concurrentqueue}"
 fi
 
 # Check if user has asked us to use a preinstalled concurrentqueue,
@@ -889,7 +883,7 @@ AM_CONDITIONAL([WITH_BUNDLED_PICOJSON], [test "x$with_bundled_picojson" = "xyes"
 
 
 if test -n "`echo $with_protobuf`"; then
-  PROTOBUF_CPPFLAGS="-isystem ${with_protobuf}/include"
+  PROTOBUF_CPPFLAGS="-I${with_protobuf}/include"
   PROTOBUF_LINKERFLAGS="-L${with_protobuf}/lib"
 
   CPPFLAGS="$PROTOBUF_CPPFLAGS $CPPFLAGS"
@@ -969,7 +963,7 @@ if test -z "`echo $with_ssl`" &&
 fi
 
 if test -n "`echo $with_ssl`"; then
-  SSL_CPPFLAGS="-isystem ${with_ssl}/include"
+  SSL_CPPFLAGS="-I${with_ssl}/include"
   SSL_LINKERFLAGS="-L${with_ssl}/lib"
 
   CPPFLAGS="$SSL_CPPFLAGS $CPPFLAGS"
@@ -1111,7 +1105,7 @@ libsubversion-1 is required for libprocess to build.
 # the CPPFLAGS and LDFLAGS with respective /include and /lib path
 # suffixes.
 if test -n "`echo $with_zlib`" ; then
-  ZLIB_CPPFLAGS="-isystem ${with_zlib}/include"
+  ZLIB_CPPFLAGS="-I${with_zlib}/include"
   ZLIB_LINKERFLAGS="-L${with_zlib}/lib"
 
   CPPFLAGS="$ZLIB_CPPFLAGS $CPPFLAGS"
@@ -1150,7 +1144,7 @@ location of protobuf used by grpc by providing a prefix path via
     ])
   fi
 
-  CPPFLAGS="$CPPFLAGS -isystem ${with_grpc}/include"
+  CPPFLAGS="$CPPFLAGS -I${with_grpc}/include"
   LDFLAGS="$LDFLAGS -L${with_grpc}/lib"
 fi