mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [01/12] mesos git commit: Added build-stamp files for gmock/glog/http-parse/libev.
Date Tue, 05 Jul 2016 19:00:21 GMT
Repository: mesos
Updated Branches:
  refs/heads/master d01ee9409 -> ada24cb6b


Added build-stamp files for gmock/glog/http-parse/libev.

This would make it easier for libprocess to declare/build these
dependencies.

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


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

Branch: refs/heads/master
Commit: da298d0a68a2fabd7d7b3a26deb1a29f2f90e5c5
Parents: d01ee94
Author: Till Toenshoff <toenshoff@me.com>
Authored: Tue Jul 5 14:12:18 2016 +0200
Committer: Kapil Arya <kapil@mesosphere.io>
Committed: Tue Jul 5 14:10:33 2016 -0400

----------------------------------------------------------------------
 3rdparty/Makefile.am | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/da298d0a/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index d287a41..662146f 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -196,13 +196,16 @@ if OS_FREEBSD
   GLOG_LDFLAGS += "LDFLAGS='-L/usr/local/lib -lexecinfo'"
 endif
 
+$(LIB_GLOG): $(GLOG)-build-stamp
+
 # NOTE: We explicitly set GTEST_CONFIG=no so that we don't attempt to
 # build glog against a system installed gtest (there's no reason to
 # "test" glog and it's highly likely it will cause a compilation bug
 # when building with clang).
-$(LIB_GLOG): $(GLOG)-stamp
+$(GLOG)-build-stamp: $(GLOG)-stamp
 	cd $(GLOG) && ./configure GTEST_CONFIG=no $(CONFIGURE_ARGS) && \
           $(MAKE) $(AM_MAKEFLAGS) $(GLOG_LDFLAGS)
+	touch $@
 
 ALL_LOCAL += $(LIB_GLOG)
 endif
@@ -230,13 +233,17 @@ libry_http_parser_la_CPPFLAGS = -I$(HTTP_PARSER) -DHTTP_PARSER_STRICT=0
 BUILT_SOURCES += $(nodist_libry_http_parser_la_SOURCES)
 
 $(HTTP_PARSER)/http_parser.c: $(HTTP_PARSER)-stamp
+$(HTTP_PARSER)-build-stamp: libry_http_parser.la
+	touch $@
 endif
 
 if WITH_BUNDLED_LIBEV
-$(LIBEV)/libev.la: $(LIBEV)-stamp
+$(LIBEV)/libev.la: $(LIBEV)-build-stamp
+$(LIBEV)-build-stamp: $(LIBEV)-stamp
 	cd $(LIBEV) && ./configure $(CONFIGURE_ARGS) && \
-          $(MAKE) $(AM_MAKEFLAGS)
-ALL_LOCAL += $(LIBEV)/libev.la
+           $(MAKE) $(AM_MAKEFLAGS)
+	touch $@
+ALL_LOCAL += $(LIBEV)-build-stamp
 endif
 
 if WITH_BUNDLED_NVML
@@ -274,6 +281,10 @@ libgmock_la_CPPFLAGS =			\
   -I$(GMOCK)/include -I$(GMOCK) -I$(GMOCK)/src
 
   gmock_sources.cc: $(GMOCK)-stamp
+
+$(GMOCK)-build-stamp: libgmock.la
+	touch $@
+ALL_LOCAL += $(GMOCK)-build-stamp
 endif
 
 if LINKGTEST


Mime
View raw message