Repository: mesos Updated Branches: refs/heads/master 2ea3819ef -> a40ca6e40
Prevented snappy and tcmalloc detection from leveldb configuration phase. Review: https://reviews.apache.org/r/18725 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a40ca6e4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a40ca6e4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a40ca6e4 Branch: refs/heads/master Commit: a40ca6e404ba84c6fbc904a16787b9272cca6ae0 Parents: 2ea3819 Author: Till Toenshoff <[email protected]> Authored: Thu Mar 6 11:14:31 2014 -0800 Committer: Vinod Kone <[email protected]> Committed: Thu Mar 6 11:14:31 2014 -0800 ---------------------------------------------------------------------- 3rdparty/leveldb.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a40ca6e4/3rdparty/leveldb.patch ---------------------------------------------------------------------- diff --git a/3rdparty/leveldb.patch b/3rdparty/leveldb.patch new file mode 100644 index 0000000..ad8c19b --- /dev/null +++ b/3rdparty/leveldb.patch @@ -0,0 +1,30 @@ +diff --git a/build_detect_platform b/build_detect_platform +index b71bf02..864e5fb 100755 +--- a/build_detect_platform ++++ b/build_detect_platform +@@ -128,24 +128,8 @@ EOF + COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX" + fi + +- # Test whether Snappy library is installed +- # http://code.google.com/p/snappy/ +- $CXX $CFLAGS -x c++ - -o /dev/null 2>/dev/null <<EOF +- #include <snappy.h> +- int main() {} +-EOF +- if [ "$?" = 0 ]; then +- COMMON_FLAGS="$COMMON_FLAGS -DSNAPPY" +- PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lsnappy" +- fi ++# Removed tests for TCMALLOC and SNAPPY to prevent additional dependencies. + +- # Test whether tcmalloc is available +- $CXX $CFLAGS -x c++ - -o /dev/null -ltcmalloc 2>/dev/null <<EOF +- int main() {} +-EOF +- if [ "$?" = 0 ]; then +- PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltcmalloc" +- fi + fi + + PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
