Skip to content

Eliminate most LD_LIBRARY_PATH from install.sh. #33

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
gwtnb wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Eliminate most LD_LIBRARY_PATH from install.sh. #33

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea5a664
Eliminate most LD_LIBRARY_PATH from install.sh.
gwtnb Mar 4, 2015
700676f
Add a temporary LD_LIBRARY_PATH for test.
gwtnb Mar 19, 2015
5e6e6c2
Use LINKFLAGS for test.
gwtnb Mar 19, 2015
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
26 changes: 12 additions & 14 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,6 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]
export PATH=${PREFIX}/bin:$PATH
export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
export LDFLAGS="-L${PREFIX}/lib"
export LD_LIBRARY_PATH="${PREFIX}/lib"
export DYLD_LIBRARY_PATH="${PREFIX}/lib"
export C_INCLUDE_PATH="${PREFIX}/include"
export CPLUS_INCLUDE_PATH="${PREFIX}/include"

Expand Down Expand Up @@ -223,7 +221,7 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]
check_result $?

cd ../ux-${UX_VER}
./waf configure --prefix=${PREFIX} && ./waf build && ./waf install
LINKFLAGS="-Wl,--rpath,${PREFIX}/lib" ./waf configure --prefix=${PREFIX} && ./waf build && ./waf install
check_result $?

cd ../mecab-${MECAB_VER}
Expand Down Expand Up @@ -261,18 +259,24 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]

cd ../jubatus_core-${JUBATUS_CORE_VER}
if [ "${USE_RE2}" == "TRUE" ]; then
./waf configure --prefix=${PREFIX} --regexp-library=re2
LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf configure --prefix=${PREFIX} --regexp-library=re2
else
./waf configure --prefix=${PREFIX}
LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf configure --prefix=${PREFIX}
fi
check_result $?
./waf build --checkall && ./waf install
LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf build --checkall
check_result $?
./waf install
check_result $?

cd ../jubatus-${JUBATUS_VER}
./waf configure --prefix=${PREFIX} --enable-ux --enable-mecab --enable-zookeeper
LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf configure --prefix=${PREFIX} --enable-ux --enable-mecab --enable-zookeeper
check_result $?
./waf build
check_result $?
LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf --checkall
check_result $?
./waf build --checkall && ./waf install
./waf install
check_result $?

cat > ${PREFIX}/share/jubatus/jubatus.profile <<EOF
Expand All @@ -290,12 +294,6 @@ export CPLUS_INCLUDE_PATH
LDFLAGS=-L\$JUBATUS_HOME/lib
export LDFLAGS

LD_LIBRARY_PATH=\$JUBATUS_HOME/lib
export LD_LIBRARY_PATH

DYLD_LIBRARY_PATH=\$JUBATUS_HOME/lib
export DYLD_LIBRARY_PATH=\$JUBATUS_HOME/lib

PKG_CONFIG_PATH=\$JUBATUS_HOME/lib/pkgconfig
export PKG_CONFIG_PATH
EOF
Expand Down