Fix for importing numpy and other python modules with native parts.

dse · dse · commit 64503620946a · 2017-08-22T21:59:12.000+04:00
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Text;
@@ -9,6 +9,27 @@ namespace Python.Runtime
     internal static class NativeMethods
     {
 #if MONO_LINUX || MONO_OSX
+#if NETCOREAPP
+        private static int RTLD_NOW = 0x2;
+#if MONO_LINUX
+        private static int RTLD_GLOBAL = 0x100;
+        private static IntPtr RTLD_DEFAULT = IntPtr.Zero;
+        private const string NativeDll = "libdl.so";
+        public static IntPtr LoadLibrary(string fileName)
+        {
+            return dlopen($"lib{fileName}.so", RTLD_NOW | RTLD_GLOBAL);
+        }
+#elif MONO_OSX
+        private static int RTLD_GLOBAL = 0x8;
+        private const string NativeDll = "/usr/lib/libSystem.dylib"
+        private static IntPtr RTLD_DEFAULT = new IntPtr(-2);
+
+        public static IntPtr LoadLibrary(string fileName)
+        {
+            return dlopen($"lib{fileName}.dylib", RTLD_NOW | RTLD_GLOBAL);
+        }
+#endif
+#else
         private static int RTLD_NOW = 0x2;
         private static int RTLD_SHARED = 0x20;
 #if MONO_OSX
@@ -23,6 +44,8 @@ public static IntPtr LoadLibrary(string fileName)
         {
             return dlopen(fileName, RTLD_NOW | RTLD_SHARED);
         }
+#endif
+
 
         public static void FreeLibrary(IntPtr handle)
         {
@@ -48,16 +71,16 @@ public static IntPtr GetProcAddress(IntPtr dllHandle, string name)
             return res;
         }
 
-        [DllImport(NativeDll)]
-        private static extern IntPtr dlopen(String fileName, int flags);
+        [DllImport(NativeDll, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern IntPtr dlopen(String fileName, int flags);
 
-        [DllImport(NativeDll)]
+        [DllImport(NativeDll, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
         private static extern IntPtr dlsym(IntPtr handle, String symbol);
 
-        [DllImport(NativeDll)]
+        [DllImport(NativeDll, CallingConvention = CallingConvention.Cdecl)]
         private static extern int dlclose(IntPtr handle);
 
-        [DllImport(NativeDll)]
+        [DllImport(NativeDll, CallingConvention = CallingConvention.Cdecl)]
         private static extern IntPtr dlerror();
 #else // Windows
         private const string NativeDll = "kernel32.dll";
@@ -158,7 +181,7 @@ public class Runtime
 
         public static readonly string PythonDLL = _PythonDll;
 
-#if PYTHON_WITHOUT_ENABLE_SHARED
+#if PYTHON_WITHOUT_ENABLE_SHARED && !NETCOREAPP
         internal const string _PythonDll = "__Internal";
 #else
         internal const string _PythonDll = dllBase + dllWithPyDebug + dllWithPyMalloc;
@@ -298,19 +321,20 @@ internal static void Initialize()
             Error = new IntPtr(-1);
 
             IntPtr dllLocal = IntPtr.Zero;
-#if !NETCOREAPP
+
             if (_PythonDll != "__Internal")
             {
                 dllLocal = NativeMethods.LoadLibrary(_PythonDll);
             }
             _PyObject_NextNotImplemented = NativeMethods.GetProcAddress(dllLocal, "_PyObject_NextNotImplemented");
+
 #if !(MONO_LINUX || MONO_OSX)
             if (dllLocal != IntPtr.Zero)
             {
                 NativeMethods.FreeLibrary(dllLocal);
             }
 #endif
-#endif
+
             // Initialize modules that depend on the runtime class.
             AssemblyManager.Initialize();
             PyCLRMetaType = MetaType.Initialize();
