From edd0e5b092668bf19be3610608627b6ede1cbc5d Mon Sep 17 00:00:00 2001
From: Braydon Fuller <braydon@bitpay.com>
Date: Thu, 9 Jul 2015 14:57:46 -0400
Subject: [PATCH 1/2] Link locally to shared library using rpath.

---
 binding.gyp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 3ae06f37..9afeb8ee 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -25,10 +25,15 @@
       '-frtti',
       '-fpermissive',
     ],
-    'libraries': [
-      '-lboost_filesystem',
-      '<!(./platform/os.sh thread)',
-      '<!(./platform/os.sh lib)'
-    ]
+    'link_settings': {
+      'libraries': [
+        '-lboost_filesystem',
+        '<!(./platform/os.sh thread)',
+        '<!(./platform/os.sh lib)'
+      ],
+      'ldflags': [
+        '-Wl,-rpath,<!(./platform/os.sh osdir)'
+      ]
+    }
   }]
 }

From e9184c17975c98650813b287161a46c8e2c31797 Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Thu, 9 Jul 2015 15:50:15 -0400
Subject: [PATCH 2/2] Mac builds point to {os_dir}/lib

---
 bin/build-libbitcoind | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index 44375d7b..b7df8d29 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -63,8 +63,11 @@ ext=$($root_dir/platform/os.sh ext)
 echo 'Copying libbitcoind.{so|dylib} to its appropriate location.'
 if test -e "${root_dir}/libbitcoind/src/.libs/libbitcoind.${ext}"; then
   if [ "$ext" = "dylib" ]; then
-    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/"
-    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/"
+    if [ ! -d "${os_dir}/lib" ]; then
+      mkdir -p "${os_dir}/lib"
+    fi 
+    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.0.dylib" "${os_dir}/lib/"
+    cp "${root_dir}/libbitcoind/src/.libs/libbitcoind.dylib" "${os_dir}/lib/"
   else
     cp -P "${root_dir}"/libbitcoind/src/.libs/libbitcoind.so* "${os_dir}/"
   fi