Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke malloc...

diff --git a/Misc/NEWS b/Misc/NEWS
index b423b8b738c305845eb37834d2b9722395907aa5..edb2fd9dba02aec76e1c8143643ae5f15921fc53 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #18178: Fix ctypes on BSD. dlmalloc.c was compiled twice which broke
+  malloc weak symbols.
+
 - Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
   inside subjectAltName correctly. Formerly the module has used OpenSSL's
   GENERAL_NAME_print() function to get the string represention of ASN.1

diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
index 5a7fd083add9bc5f565e888fa1e0cd986c384dd7..35be29cb3a6998db49325b935e1d77d18c15cefa 100644 (file)
--- a/Modules/_ctypes/libffi/fficonfig.py.in
+++ b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -1,7 +1,6 @@
 ffi_sources = """
 src/prep_cif.c
 src/closures.c
-src/dlmalloc.c
 """.split()
 
 ffi_platforms = {