From c6cc2ee871f007847937c792b0438d9470b7831d Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 May 2014 01:00:29 +0200
Subject: [PATCH 1/3] build: fix formatting in binding.gyp

* Fix indentation.
* Strip trailing whitespace.
* Use ' and " consistently.

Cosmetic changes only, no functional changes.
---
 binding.gyp | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 0ed3159..d3a371b 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -2,8 +2,8 @@
   "targets": [
     {
       "target_name": "oracle_bindings",
-      "sources": [ "src/connection.cpp", 
-                   "src/oracle_bindings.cpp", 
+      "sources": [ "src/connection.cpp",
+                   "src/oracle_bindings.cpp",
                    "src/executeBaton.cpp",
                    "src/outParam.cpp",
                    "src/reader.cpp",
@@ -15,43 +15,43 @@
             "GCC_ENABLE_CPP_RTTI": "YES"
           },
           "variables": {
-			 "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
-			 "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
+           "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
+           "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
           },
           "libraries": [ "-locci", "-lclntsh", "-lnnz11" ],
-          "link_settings": {"libraries": [ '-L<(oci_lib_dir)'] }
+          "link_settings": {"libraries": [ "-L<(oci_lib_dir)"] }
         }],
         ["OS=='linux'", {
           "variables": {
-			 "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
-			 "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
+           "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
+           "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
           },
           "libraries": [ "-locci", "-lclntsh", "-lnnz12" ],
-          "link_settings": {"libraries": [ '-L<(oci_lib_dir)'] }
+          "link_settings": {"libraries": [ "-L<(oci_lib_dir)"] }
         }],
         ["OS=='win'", {
-	  "configurations": {
-          "Release": {
-            "msvs_settings": {
-              "VCCLCompilerTool": {
-                "RuntimeLibrary": "2"
-              }
+          "configurations": {
+            "Release": {
+              "msvs_settings": {
+                "VCCLCompilerTool": {
+                  "RuntimeLibrary": "2"
+                }
+              },
             },
-	  },   
-          "Debug": {
-            "msvs_settings": {
-              "VCCLCompilerTool": {
-              "RuntimeLibrary": "3"
-              }
-            }, 
-	  }
-	  },
+            "Debug": {
+              "msvs_settings": {
+                "VCCLCompilerTool": {
+                "RuntimeLibrary": "3"
+                }
+              },
+            },
+          },
           "variables": {
             "oci_include_dir%": "<!(IF DEFINED OCI_INCLUDE_DIR (echo %OCI_INCLUDE_DIR%) ELSE (echo C:\oracle\instantclient\sdk\include))",
             "oci_lib_dir%": "<!(IF DEFINED OCI_LIB_DIR (echo %OCI_LIB_DIR%) ELSE (echo C:\oracle\instantclient\sdk\lib\msvc))",
          },
          # "libraries": [ "-loci" ],
-         "link_settings": {"libraries": [ '<(oci_lib_dir)\oraocci12.lib'] }
+         "link_settings": {"libraries": [ "<(oci_lib_dir)\oraocci12.lib"] }
         }]
       ],
       "include_dirs": [ "<(oci_include_dir)", "<!(node -e \"require('nan')\")" ],
@@ -60,5 +60,3 @@
     }
   ]
 }
-
-

From 57c78f4a635c6a511de478c362b0ec66c0580ace Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 May 2014 01:11:33 +0200
Subject: [PATCH 2/3] build: set RPATH when linking

Add the directory containing libocci to the dynamic linker search path
so strong-oracle users don't have to set LD_LIBRARY_PATH at run-time.
---
 binding.gyp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index d3a371b..0183468 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -26,8 +26,10 @@
            "oci_include_dir%": "<!(if [ -z $OCI_INCLUDE_DIR ]; then echo \"/opt/instantclient/sdk/include/\"; else echo $OCI_INCLUDE_DIR; fi)",
            "oci_lib_dir%": "<!(if [ -z $OCI_LIB_DIR ]; then echo \"/opt/instantclient/\"; else echo $OCI_LIB_DIR; fi)",
           },
-          "libraries": [ "-locci", "-lclntsh", "-lnnz12" ],
-          "link_settings": {"libraries": [ "-L<(oci_lib_dir)"] }
+          "link_settings": {
+            "libraries": [ "-L<(oci_lib_dir)", "-lclntsh", "-lnnz12", "-locci" ],
+            "ldflags": [ "-Wl,-rpath,<(oci_lib_dir)" ],
+          },
         }],
         ["OS=='win'", {
           "configurations": {

From c9ba5ef142fcfb362cb5514df96c0f4838127510 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 May 2014 19:49:21 +0200
Subject: [PATCH 3/3] test: set DYLD_BIND_AT_LAUNCH / LD_BIND_NOW

Make it harder for dynamic linker errors to slip through by forcing the
tests to run with all dynamic symbols resolved.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f76e1b..f8a0aba 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "mocha": "~1.18.2"
   },
   "scripts": {
-    "test": "./node_modules/.bin/mocha -R spec --timeout 10000 test/*.js"
+    "test": "env DYLD_BIND_AT_LAUNCH=1 LD_BIND_NOW=1 ./node_modules/.bin/mocha -R spec --timeout 10000 test/*.js"
   },
   "main": "./index.js",
   "license": {