Fixed the dependency on system-installed boost libs.
This commit is contained in:
parent
20bbe650c6
commit
2fdabd721e
|
@ -1,10 +1,12 @@
|
|||
#!/bin/bash
|
||||
root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
|
||||
cd "${root_dir}"
|
||||
options=`cat ${root_dir}/bin/config_options.sh`
|
||||
|
||||
depends_dir=$($root_dir/platform/os.sh depends_dir)
|
||||
os_dir=$(./platform/os.sh osdir)
|
||||
host=$(./platform/os.sh host)
|
||||
|
||||
cd "${root_dir}"
|
||||
|
||||
build_dependencies () {
|
||||
if [ -d "${btc_dir}" ]; then
|
||||
pushd "${btc_dir}"/depends
|
||||
|
@ -35,8 +37,6 @@ compare_patch () {
|
|||
matching_patch=`diff -w /tmp/tmp.patch "${root_dir}/etc/bitcoin.patch"`
|
||||
}
|
||||
#set the LD_LIBRARY_PATH for the linux clients.
|
||||
export LD_LIBRARY_PATH="${root_dir}/libbitcoind/src/leveldb":"${os_dir}":$LD_LIBRARY_PATH
|
||||
|
||||
debug=
|
||||
if [ "${BITCOINDJS_ENV}" == "debug" ]; then
|
||||
options=`cat ${root_dir}/bin/config_options_debug.sh`
|
||||
|
@ -104,10 +104,14 @@ fi
|
|||
build_dependencies
|
||||
echo './autogen.sh'
|
||||
./autogen.sh
|
||||
export CPPFLAGS="-I${btc_dir}/depends/${host}/include/boost -I${btc_dir}/depends/${host}/include -L${btc_dir}/depends/${host}/lib"
|
||||
full_options="${options}${os_dir}"
|
||||
|
||||
export CPPFLAGS="-I${depends_dir}/include/boost -I${depends_dir}/include -L${depends_dir}/lib"
|
||||
boost_libdir="--with-boost-libdir=${depends_dir}/lib"
|
||||
|
||||
full_options="${options} ${boost_libdir} --prefix=${os_dir}"
|
||||
echo "running the configure script with the following options:\n :::[\"${full_options}\"]:::"
|
||||
${full_options}
|
||||
|
||||
echo 'make V=1'
|
||||
make V=1
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils --prefix=
|
||||
./configure --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils --prefix=
|
||||
./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --without-bdb --disable-wallet --without-utils
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc --prefix=
|
||||
./configure --enable-debug --enable-tests=no --enable-daemonlib --with-gui=no --without-qt --without-miniupnpc
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
'target_name': 'bitcoindjs',
|
||||
'include_dirs' : [
|
||||
'<!(node -e "require(\'nan\')")',
|
||||
'<!(./platform/os.sh depends_dir)/include/boost',
|
||||
'<!(./platform/os.sh depends_dir)/include',
|
||||
'./libbitcoind/src/leveldb/include',
|
||||
'./libbitcoind/src',
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue