Merge pull request #148 from qTich/feature/macos-arm64-ctypes

fix: #139
renpy · Dec 17, 2024 · c9412db · c9412db
2 parents 38a6fb4 + 090757c
commit c9412db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/source/Python-3.11.10-Setup.stdlib b/source/Python-3.11.10-Setup.stdlib
@@ -73,9 +73,9 @@ _multibytecodec -DPy_BUILD_CORE_BUILTIN cjkcodecs/multibytecodec.c
 {% if (c.kind == "host") or (c.platform != "windows") %}
 
 {% if c.platform in ['mac', 'ios'] %}
-_ctypes -DPy_BUILD_CORE_BUILTIN -DUSING_MALLOC_CLOSURE_DOT_C _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/malloc_closure.c _ctypes/stgdict.c _ctypes/cfield.c -lffi
+_ctypes -DPy_BUILD_CORE_BUILTIN -DUSING_MALLOC_CLOSURE_DOT_C _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/malloc_closure.c _ctypes/stgdict.c _ctypes/cfield.c -ldl -lffi -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
 {% elif c.platform != "web" %}
-_ctypes -DPy_BUILD_CORE_BUILTIN _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c -lffi
+_ctypes -DPy_BUILD_CORE_BUILTIN _ctypes/_ctypes.c _ctypes/callbacks.c _ctypes/callproc.c _ctypes/stgdict.c _ctypes/cfield.c -ldl -lffi -DHAVE_FFI_PREP_CIF_VAR -DHAVE_FFI_PREP_CLOSURE_LOC -DHAVE_FFI_CLOSURE_ALLOC
 {% endif %}
 
 _socket -DPy_BUILD_CORE_BUILTIN socketmodule.c -lm

diff --git a/tasks/python3.py b/tasks/python3.py
@@ -110,7 +110,6 @@ def build_posix(c: Context):
     c.run("""
         {{configure}} {{ cross_config }}
         --prefix="{{ install }}"
-        --with-system-ffi
         --enable-ipv6
         --with-build-python={{host}}/bin/python3
         --with-ensurepip=no
@@ -146,7 +145,6 @@ def build_ios(c: Context):
     c.run("""
         {{configure}} {{ cross_config }}
         --prefix="{{ install }}"
-        --with-system-ffi
         --disable-toolbox-glue
         --enable-ipv6
         --with-build-python={{host}}/bin/python3
@@ -167,7 +165,6 @@ def build_android(c: Context):
     c.run("""
         {{configure}} {{ cross_config }}
         --prefix="{{ install }}"
-        --with-system-ffi
         --enable-ipv6
         --with-build-python={{host}}/bin/python3
         --with-ensurepip=no
@@ -196,7 +193,6 @@ def build_windows(c: Context):
           {{configure}} {{ cross_config }}
           --enable-shared
           --prefix="{{ install }}"
-          --with-system-ffi
           --with-build-python={{host}}/bin/python3
           --with-ensurepip=no
     """)