Rpath (hmenyus#18)

hmenyus · web-flow · commit 69df6e75bbe7 · 2022-07-12T00:55:14.000+02:00
* rpath

* rpath
diff --git a/binding.gyp b/binding.gyp
@@ -30,11 +30,12 @@
                     ],
                     "link_settings": {
                         "libraries": [
-                            "<!(python3-config --ldflags --embed)"
+                            "<!(python3-config --ldflags --embed)",
+                            "<!(node ./scripts/rpaths.js)"
                         ]
                     },
-                    'cflags': ['-fexceptions'],
-                    'cflags_cc': ['-fexceptions']
+                    'cflags': ["<!(python3-config --cflags)", "-fexceptions"],
+                    'cflags_cc': ["<!(python3-config --cflags)", "-fexceptions"]
                 }],
                 ['OS=="mac"', {
                     "include_dirs" : [
diff --git a/index.js b/index.js
@@ -8,17 +8,27 @@ class Interpreter
     constructor()
     {
         this.py = new nodecallspython.PyInterpreter();
-        if (process.platform === "linux")
+        if (process.platform === "linux" || process.platform === "darwin")
         {
             const stdout = execSync("python3-config --configdir");
             if (stdout)
             {
                 const dir = stdout.toString().trim();
                 if (fs.existsSync(dir))
                 {
+                    const reg = process.platform === "linux" ? /libpython.*\.so/ : /libpython.*\.dylib/;
                     fs.readdirSync(dir).forEach(file => {
-                        if (file.match(/libpython.*\.so/))
-                            this.fixlink(path.join(dir, file));
+                        if (file.match(reg))
+                        {
+                            try
+                            {
+                                this.fixlink(path.join(dir, file));
+                            }
+                            catch(e)
+                            {
+                                console.error(e);
+                            }
+                        }
                     });
                 }
             }
diff --git a/scripts/rpaths.js b/scripts/rpaths.js
@@ -0,0 +1,27 @@
+const { execSync } = require("child_process");
+
+const stdout = execSync("python3-config --ldflags --embed");
+if (stdout)
+{
+    const splits = stdout.toString().trim().split(" ");
+
+    const result = [];
+    splits.forEach(s => {
+        if (s.startsWith("-L"))
+            result.push(s.substring(2));
+    });
+
+    result.forEach((r, i) => {
+        if (i == 0)
+        {
+            if (result.length > 1)
+                console.log("-Wl,-rpath," + r +" \\");
+            else
+                console.log("-Wl,-rpath," + r);
+        }
+        else if (i + 1 == result.length)
+            console.log("\t-Wl,-rpath," + r);
+        else
+            console.log("\t-Wl,-rpath," + r + " \\");
+    });
+}
diff --git a/src/addon.cpp b/src/addon.cpp
@@ -562,7 +562,15 @@ namespace nodecallspython
             if (valuetype == napi_string)
             {
                 auto filename = convertString(env, args[0]);
-                dlopen(filename.c_str(), RTLD_LAZY | RTLD_GLOBAL);
+                auto result = dlopen(filename.c_str(), RTLD_LAZY | RTLD_GLOBAL);
+                if (!result)
+                {
+                    auto error = dlerror();
+                    if (error)
+                        napi_throw_error(env, "args", error);
+                    else
+                        napi_throw_error(env, "args", "Unknown error of dlopen");
+                }
                 
                 return nullptr;
             }

Original file line number	Diff line number	Diff line change
`@@ -8,17 +8,27 @@ class Interpreter`
`8`	`8`	`constructor()`
`9`	`9`	`{`
`10`	`10`	`this.py = new nodecallspython.PyInterpreter();`
`11`		`- if (process.platform === "linux")`
	`11`	`+ if (process.platform === "linux" \|\| process.platform === "darwin")`
`12`	`12`	`{`
`13`	`13`	`const stdout = execSync("python3-config --configdir");`
`14`	`14`	`if (stdout)`
`15`	`15`	`{`
`16`	`16`	`const dir = stdout.toString().trim();`
`17`	`17`	`if (fs.existsSync(dir))`
`18`	`18`	`{`
	`19`	`+ const reg = process.platform === "linux" ? /libpython.\.so/ : /libpython.\.dylib/;`
`19`	`20`	`fs.readdirSync(dir).forEach(file => {`
`20`		`- if (file.match(/libpython.*\.so/))`
`21`		`- this.fixlink(path.join(dir, file));`
	`21`	`+ if (file.match(reg))`
	`22`	`+ {`
	`23`	`+ try`
	`24`	`+ {`
	`25`	`+ this.fixlink(path.join(dir, file));`
	`26`	`+ }`
	`27`	`+ catch(e)`
	`28`	`+ {`
	`29`	`+ console.error(e);`
	`30`	`+ }`
	`31`	`+ }`
`22`	`32`	`});`
`23`	`33`	`}`
`24`	`34`	`}`