Skip to content

gh-90005: Port _ctypes to PY_STDLIB_MOD #32229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 13 commits into from
Jun 26, 2022
Merged

gh-90005: Port _ctypes to PY_STDLIB_MOD #32229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7c494e
bpo-45847: Port _ctypes partly to PY_STDLIB_MOD (GH-29747)
tiran Dec 4, 2021
03e630c
Port macOS specific ctypes code
tiran Apr 1, 2022
31a744b
ctypes build no longer depends on other modules
tiran Apr 1, 2022
5fabd8b
AS_VAR_APPEND needs explicit space
tiran Apr 1, 2022
7932611
Detect macOS SDKROOT with xcrun
tiran Apr 1, 2022
0b679b6
Fix CFLAGS
tiran Apr 1, 2022
6cafbfe
Use system-ffi by default on macOS
tiran Apr 1, 2022
0f1162a
Use PY_CHECK_FUNC to look for ffi functions
tiran Apr 2, 2022
d6cd64a
SDK libffi
tiran Apr 2, 2022
4914c9e
Check for have_libffi
tiran Apr 4, 2022
6849e30
Remove special case for hpux
tiran May 23, 2022
d854d7f
rename news entry
tiran Jun 26, 2022
fecba2a
Update configure.ac
tiran Jun 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
AS_VAR_APPEND needs explicit space
  • Loading branch information
@tiran
tiran committed Jun 26, 2022
commit 5fabd8b705305cc463f480fc60c2ea6ed46bcda5
12 changes: 6 additions & 6 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@ AC_DEFINE_UNQUOTED([PY_SUPPORT_TIER], [$PY_SUPPORT_TIER], [PEP 11 Support tier (

AC_CACHE_CHECK([for -Wl,--no-as-needed], [ac_cv_wl_no_as_needed], [
save_LDFLAGS="$LDFLAGS"
AS_VAR_APPEND([LDFLAGS], [-Wl,--no-as-needed])
AS_VAR_APPEND([LDFLAGS], [" -Wl,--no-as-needed"])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
[NO_AS_NEEDED="-Wl,--no-as-needed"
ac_cv_wl_no_as_needed=yes],
Expand Down Expand Up @@ -3581,21 +3581,21 @@ ctypes_malloc_closure=no
AS_CASE([$ac_sys_system],
[Darwin], [
dnl when do we need USING_APPLE_OS_LIBFFI?
AS_VAR_APPEND([LIBFFI_CFLAGS], ['-I$(srcdir)/Modules/_ctypes/darwin -DMACOSX '])
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -I\$(srcdir)/Modules/_ctypes/darwin -DMACOSX"])
ctypes_malloc_closure=yes
],
[sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [-mimpure-text])],
[hp*|HP*], [AS_VAR_APPEND([LIBFFI_LIBS], [-fPIC])]
[sunos5], [AS_VAR_APPEND([LIBFFI_LIBS], [" -mimpure-text"])],
[hp*|HP*], [AS_VAR_APPEND([LIBFFI_LIBS], [" -fPIC"])]
)

AS_VAR_IF([ctypes_malloc_closure], [yes], [
MODULE__CTYPES_MALLOC_CLOSURE=_ctypes/malloc_closure.c
AS_VAR_APPEND([LIBFFI_CFLAGS], ['-DUSING_MALLOC_CLOSURE_DOT_C=1 '])
AS_VAR_APPEND([LIBFFI_CFLAGS], [" -DUSING_MALLOC_CLOSURE_DOT_C=1"])
])
AC_SUBST([MODULE__CTYPES_MALLOC_CLOSURE])

dnl HAVE_LIBDL: for dlopen, see bpo-32647
AS_VAR_IF([ac_cv_lib_dl_dlopen], [yes], [AS_VAR_APPEND([LIBFFI_LIBS], [-ldl])])
AS_VAR_IF([ac_cv_lib_dl_dlopen], [yes], [AS_VAR_APPEND([LIBFFI_LIBS], [" -ldl"])])

if test "$with_system_ffi" = yes -a "$have_libffi" = yes; then
WITH_SAVE_ENV([
Expand Down