Skip to content

Commit 71f2a20

Browse files
committed
distribute native lib on windows with same name as cpython
1 parent 493b86b commit 71f2a20

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

graalpython/com.oracle.graal.python.cext/include/pyconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// relevant for code that is compiled without bitcode and will run only
5656
// natively. Since the pythonjni library contains all the trampolines to call
5757
// into the python-native.dll in this case, we must only depend on that.
58-
# pragma comment(lib, "python-native.lib")
58+
# pragma comment(lib, "python311.lib")
5959
# endif
6060
#endif
6161

graalpython/lib-graalpython/patches/numpy/numpy-1.26.4.patch

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@ index d4b73eb..af90a68 100644
1010
try:
1111
import ctypes
1212
process_arch = ctypes.c_ushort()
13-
--- a/vendored-meson/meson/mesonbuild/dependencies/python.py
14-
+++ b/vendored-meson/meson/mesonbuild/dependencies/python.py
15-
@@ -286,6 +286,8 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase):
16-
libpath = Path(f'libpypy{verdot}-c.dll')
17-
else:
18-
libpath = Path(f'python{vernum}.dll')
19-
+ elif self.variables.get('SOABI', '').startswith('graalpy'):
20-
+ libpath = Path('libs') / 'python-native.lib'
21-
else:
22-
if limited_api:
23-
vernum = vernum[0]
2413
--- a/numpy/core/include/numpy/ndarrayobject.h
2514
+++ b/numpy/core/include/numpy/ndarrayobject.h
2615
@@ -225,7 +225,7 @@ NPY_TITLE_KEY_check(PyObject *key, PyObject *value)

mx.graalpython/suite.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,9 +1320,7 @@
13201320
"windows": {
13211321
"<others>": {
13221322
"layout": {
1323-
"./META-INF/resources/<os>/<arch>/libs/": [
1324-
"dependency:GRAALPYTHON_NATIVE_LIBS/<os>/<arch>/python-native.lib",
1325-
],
1323+
"./META-INF/resources/<os>/<arch>/libs/python<py_ver:major_minor_nodot>.lib": "dependency:GRAALPYTHON_NATIVE_LIBS/<os>/<arch>/python-native.lib",
13261324
"./META-INF/resources/<os>/<arch>/lib-graalpython/": [
13271325
{
13281326
"source_type": "dependency",

0 commit comments

Comments
 (0)