From 043f89a66ebe9f8a76a6c31d54cc4cd22d1eab4d Mon Sep 17 00:00:00 2001 From: "Lucas A. Dohring" Date: Mon, 10 Jun 2013 13:40:46 -0700 Subject: [PATCH 1/2] Can build on more systems --- cmake/FindBerkeleyDB.cmake | 3 ++- cmake/FindCronolog.cmake | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmake/FindBerkeleyDB.cmake b/cmake/FindBerkeleyDB.cmake index a90c7f969..49ded84ff 100644 --- a/cmake/FindBerkeleyDB.cmake +++ b/cmake/FindBerkeleyDB.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 Hypertable, Inc. +# Copyright (C) 2007-2013 Hypertable, Inc. # # This file is part of Hypertable. # @@ -34,6 +34,7 @@ find_path(BDB_INCLUDE_DIR db_cxx.h NO_DEFAULT_PATH PATHS /usr/local/include/db48 /opt/local/include/db48 /usr/local/include + /usr/include/db4.8 /usr/include/db4 /usr/include ) diff --git a/cmake/FindCronolog.cmake b/cmake/FindCronolog.cmake index 074b4fcde..0dcc838dc 100644 --- a/cmake/FindCronolog.cmake +++ b/cmake/FindCronolog.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 Hypertable, Inc. +# Copyright (C) 2007-2013 Hypertable, Inc. # # This file is part of Hypertable. # @@ -16,7 +16,7 @@ # along with Hypertable. If not, see # -# - Find Cronolog +# - Find Cronolog # Check if the cronolog binary is installed # # CRONOLOG_DIR - Directory where cronolog is located @@ -24,6 +24,7 @@ find_path(CRONOLOG_DIR cronolog /usr/bin + /usr/sbin /usr/local/bin /usr/local/sbin ) From eb4929c8281c8f61e2238051ffc7ae2184750c4b Mon Sep 17 00:00:00 2001 From: Jordi Llonch Date: Tue, 2 Jul 2013 10:41:31 +1000 Subject: [PATCH 2/2] matched thrift version --- bin/src-utils/build-setup-debian.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/src-utils/build-setup-debian.sh b/bin/src-utils/build-setup-debian.sh index c52c0b636..531e11ddb 100755 --- a/bin/src-utils/build-setup-debian.sh +++ b/bin/src-utils/build-setup-debian.sh @@ -133,10 +133,10 @@ cd ~; rm -rf libevent-1.4.14b-stable* # Thrift cd /usr/src wget http://apache.mirror.anlx.net/thrift/0.8.0/thrift-0.8.0.tar.gz -tar xzvf thrift-0.7.0.tar.gz +tar xzvf thrift-0.8.0.tar.gz rm -f thrift -ln -s thrift-0.7.0 thrift -cd thrift-0.7.0 +ln -s thrift-0.8.0 thrift +cd thrift-0.8.0 chmod 755 ./configure ./lib/php/src/ext/thrift_protocol/build/shtool ./configure make