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

diff --git a/Misc/NEWS b/Misc/NEWS
index 37ada36c0c65b2c9a03f289edc4d058ee729b95b..40816c702e3bfd0ade37a78c529bb3409e347f0b 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,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 27c971f86f2486a0f1c8587b9d5172117c482e06..c91081487614e8ad8050505de9f3c71f7bc4a17c 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 = {