From ea5a664be7a481675b936195cb233e1bde6659c9 Mon Sep 17 00:00:00 2001
From: Gentaro Watanabe <g.wtnb@preferred.jp>
Date: Wed, 4 Mar 2015 21:23:34 +0900
Subject: [PATCH 1/3] Eliminate most LD_LIBRARY_PATH from install.sh.

Use rpath to find libraries instead of LD_LIBRARY_PATH.
Why LD_RUN_PATH is not used is that ld.gold does not recognize LD_RUN_PATH for now.
https://sourceware.org/bugzilla/show_bug.cgi?id=13764
---
 install.sh | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/install.sh b/install.sh
index 211c45f..55fe637 100755
--- a/install.sh
+++ b/install.sh
@@ -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"
 
@@ -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}
@@ -270,9 +268,13 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]
     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 --checkall && ./waf install
+    ./waf build
+    check_result $?
+    LD_LIBRARY_PATH=${PREFIX}/lib DYLD_LIBRARY_PATH=${PREFIX}/lib ./waf --checkall
+    check_result $?
+    ./waf install
     check_result $?
 
     cat > ${PREFIX}/share/jubatus/jubatus.profile <<EOF
@@ -290,12 +292,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

From 700676f7ac47c5f7bdb841c679106c7faf633d41 Mon Sep 17 00:00:00 2001
From: Gentaro Watanabe <g.wtnb@preferred.jp>
Date: Thu, 19 Mar 2015 16:52:04 +0900
Subject: [PATCH 2/3] Add a temporary LD_LIBRARY_PATH for test.

---
 install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/install.sh b/install.sh
index 55fe637..944af6c 100755
--- a/install.sh
+++ b/install.sh
@@ -264,7 +264,9 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]
       ./waf configure --prefix=${PREFIX}
     fi
     check_result $?
-    ./waf build --checkall && ./waf install
+    LD_LIBRARY_PATH=${PREFIX}/lib ./waf build --checkall
+    check_result $?
+    ./waf install
     check_result $?
 
     cd ../jubatus-${JUBATUS_VER}

From 5e6e6c2eb17b3f53cca40bc447c0c9f400c44633 Mon Sep 17 00:00:00 2001
From: Gentaro Watanabe <g.wtnb@preferred.jp>
Date: Thu, 19 Mar 2015 17:18:27 +0900
Subject: [PATCH 3/3] Use LINKFLAGS for test.

---
 install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 944af6c..724b11b 100755
--- a/install.sh
+++ b/install.sh
@@ -259,12 +259,12 @@ 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 $?
-    LD_LIBRARY_PATH=${PREFIX}/lib ./waf build --checkall
+    LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf build --checkall
     check_result $?
     ./waf install
     check_result $?
@@ -274,7 +274,7 @@ if [ "${DOWNLOAD_ONLY}" != "TRUE" ]
     check_result $?
     ./waf build
     check_result $?
-    LD_LIBRARY_PATH=${PREFIX}/lib DYLD_LIBRARY_PATH=${PREFIX}/lib ./waf --checkall
+    LINKFLAGS="-Wl,-rpath,${PREFIX}/lib" ./waf --checkall
     check_result $?
     ./waf install
     check_result $?