You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ya...@apache.org on 2014/07/29 20:26:31 UTC
git commit: Fixed a bug that caused 'make dist' unable to patch
leveldb.
Repository: mesos
Updated Branches:
refs/heads/master d02bb3c72 -> 25666ce6a
Fixed a bug that caused 'make dist' unable to patch leveldb.
Review: https://reviews.apache.org/r/24061
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/25666ce6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/25666ce6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/25666ce6
Branch: refs/heads/master
Commit: 25666ce6add6b0f071268e6ddef46b1f22098ed4
Parents: d02bb3c
Author: Jiang Yan Xu <ya...@jxu.me>
Authored: Tue Jul 29 11:11:16 2014 -0700
Committer: Jiang Yan Xu <ya...@jxu.me>
Committed: Tue Jul 29 11:25:33 2014 -0700
----------------------------------------------------------------------
3rdparty/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/25666ce6/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index cfeaac7..70b45fe 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -42,6 +42,11 @@ EXTRA_DIST = \
$(LEVELDB).tar.gz \
$(ZOOKEEPER).tar.gz
+# We need to patch leveldb to prevent it from linking to snappy and
+# tcmalloc; see MESOS-1054, MESOS-1624.
+EXTRA_DIST += \
+ $(LEVELDB).patch
+
CLEAN_EXTRACTED = \
$(DISTRIBUTE) \
$(LEVELDB) \