Repository: mesos Updated Branches: refs/heads/master 74878e255 -> ea6a799fe
Removed unnecessary leveldb build rules. After upgraded to leveldb 1.19, the default CXXFLAGS of Mesos conflict with the require flags when building `db/c_test.c` with clang in macOS. This patch disables unnecessary rules in leveldb and bypass build failures in macOS. Review: https://reviews.apache.org/r/56847/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ea6a799f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ea6a799f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ea6a799f Branch: refs/heads/master Commit: ea6a799fee5e1d7b55674eab06d6768736b584ea Parents: 74878e2 Author: Tomasz Janiszewski <[email protected]> Authored: Tue Feb 21 00:22:15 2017 +0800 Committer: Haosdent Huang <[email protected]> Committed: Tue Feb 21 00:34:56 2017 +0800 ---------------------------------------------------------------------- 3rdparty/leveldb-1.19.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ea6a799f/3rdparty/leveldb-1.19.patch ---------------------------------------------------------------------- diff --git a/3rdparty/leveldb-1.19.patch b/3rdparty/leveldb-1.19.patch index e281e95..c6c44ae 100644 --- a/3rdparty/leveldb-1.19.patch +++ b/3rdparty/leveldb-1.19.patch @@ -1,3 +1,16 @@ +diff --git a/Makefile b/Makefile +index 07a5a1e..089da7c 100644 +--- a/Makefile ++++ b/Makefile +@@ -138,7 +138,7 @@ $(SHARED_OUTDIR)/$(SHARED_LIB3): $(SHARED_LIBOBJECTS) + + endif # PLATFORM_SHARED_EXT + +-all: $(SHARED_LIBS) $(SHARED_PROGRAMS) $(STATIC_OUTDIR)/libleveldb.a $(STATIC_OUTDIR)/libmemenv.a $(STATIC_PROGRAMS) ++all: $(STATIC_OUTDIR)/libleveldb.a + + check: $(STATIC_PROGRAMS) + for t in $(notdir $(TESTS)); do echo "***** Running $$t"; $(STATIC_OUTDIR)/$$t || exit 1; done diff --git a/build_detect_platform b/build_detect_platform index bb76c4f..c403e91 100755 --- a/build_detect_platform
