You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/06/19 23:07:20 UTC
mesos git commit: Fixed Autotools `cd 3rdparty/stout && make tests`
build.
Repository: mesos
Updated Branches:
refs/heads/master 22524ecdd -> 4ea9c7f96
Fixed Autotools `cd 3rdparty/stout && make tests` build.
Building `stout-tests` without having first built the default targets
was broken for two reasons: it was lacking the dependency required to
build the bundled `libarchive`, and it was lacking the dependency
required to generate the test `protobuf` sources.
Review: https://reviews.apache.org/r/67656
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4ea9c7f9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4ea9c7f9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4ea9c7f9
Branch: refs/heads/master
Commit: 4ea9c7f964e38af789b75edbc8dc8d86116cb8d9
Parents: 22524ec
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Tue Jun 19 14:15:23 2018 -0700
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Tue Jun 19 16:07:01 2018 -0700
----------------------------------------------------------------------
3rdparty/stout/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4ea9c7f9/3rdparty/stout/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/stout/Makefile.am b/3rdparty/stout/Makefile.am
index 5b922af..5a9db57 100644
--- a/3rdparty/stout/Makefile.am
+++ b/3rdparty/stout/Makefile.am
@@ -101,6 +101,8 @@ PICOJSON_INCLUDE_FLAGS = \
if WITH_BUNDLED_LIBARCHIVE
LIBARCHIVE_INCLUDE_FLAGS = -I$(LIBARCHIVE)/libarchive
LIB_LIBARCHIVE = $(LIBARCHIVE)/.libs/libarchive.la
+$(LIB_LIBARCHIVE): $(LIBARCHIVE)-build-stamp
+BUNDLED_DEPS += $(LIBARCHIVE)-build-stamp
else
LIB_LIBARCHIVE = -larchive
endif
@@ -242,7 +244,7 @@ CLEANFILES = \
check-local: tests
$(TEST_DRIVER) ./stout-tests
-tests: $(BUNDLED_DEPS)
+tests: $(BUNDLED_DEPS) $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) stout-tests
PHONY_TARGETS += tests