8000 matched thrift version by llonchj · Pull Request #4 · hypertable/hypertable · GitHub
[go: up one dir, main page]
Skip to content

matched thrift version #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
llonchj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

matched thrift version #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
043f89a
Can build on more systems
lucasad Jun 10, 2013
eb4929c
matched thrift version
llonchj Jul 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bin/src-utils/build-setup-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion cmake/FindBerkeleyDB.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2007-2012 Hypertable, Inc.
# Copyright (C) 2007-2013 Hypertable, Inc.
#
# This file is part of Hypertable.
#
Expand Down Expand Up @@ -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
)
Expand Down
5 changes: 3 additions & 2 deletions cmake/FindCronolog.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2007-2012 Hypertable, Inc.
# Copyright (C) 2007-2013 Hypertable, Inc.
#
# This file is part of Hypertable.
#
Expand All @@ -16,14 +16,15 @@
# along with Hypertable. If not, see <http://www.gnu.org/licenses/>
#

# - Find Cronolog
# - Find Cronolog
# Check if the cronolog binary is installed
#
# CRONOLOG_DIR - Directory where cronolog is located
# CRONOLOG_FOUND - True if cronolog was found

find_path(CRONOLOG_DIR cronolog
/usr/bin
/usr/sbin
/usr/local/bin
/usr/local/sbin
)
Expand Down
0