From 35b1153c8be0e15862c12f951af6c9b8f1d3004f Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 8 Jul 2022 22:19:44 +0200 Subject: [PATCH 1/2] gh-93649: Fix dependencies of _testcapi - header files are located in $(srcdir) - dependencies must not list C files that are also in a makesetup Setup file --- Makefile.pre.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index c17c3d6067d977..e1dc503059ec28 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -2568,7 +2568,7 @@ MODULE__SHA3_DEPS=$(srcdir)/Modules/_sha3/sha3.c $(srcdir)/Modules/_sha3/sha3.h MODULE__SHA512_DEPS=$(srcdir)/Modules/hashlib.h MODULE__SOCKET_DEPS=$(srcdir)/Modules/socketmodule.h MODULE__SSL_DEPS=$(srcdir)/Modules/_ssl.h $(srcdir)/Modules/_ssl/cert.c $(srcdir)/Modules/_ssl/debughelpers.c $(srcdir)/Modules/_ssl/misc.c $(srcdir)/Modules/_ssl_data.h $(srcdir)/Modules/_ssl_data_111.h $(srcdir)/Modules/_ssl_data_300.h $(srcdir)/Modules/socketmodule.h -MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h Modules/_testcapi/parts.h $(srcdir)/Modules/_testcapi/vectorcall.c +MODULE__TESTCAPI_DEPS=$(srcdir)/Modules/testcapi_long.h $(srcdir)/Modules/_testcapi/parts.h MODULE__SQLITE3_DEPS=$(srcdir)/Modules/_sqlite/connection.h $(srcdir)/Modules/_sqlite/cursor.h $(srcdir)/Modules/_sqlite/microprotocols.h $(srcdir)/Modules/_sqlite/module.h $(srcdir)/Modules/_sqlite/prepare_protocol.h $(srcdir)/Modules/_sqlite/row.h $(srcdir)/Modules/_sqlite/util.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY From a09b7e309573bc1cb8bdf9f20d2af9db5f7b21cc Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Sat, 9 Jul 2022 11:22:18 +0200 Subject: [PATCH 2/2] Also generate SRCDIRS for OOT builds --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 5f2830338ee8fa..bffc30a590fbe4 100755 --- a/configure +++ b/configure @@ -23261,6 +23261,7 @@ SRCDIRS="\ Modules/_sha3 \ Modules/_sqlite \ Modules/_sre \ + Modules/_testcapi \ Modules/_xxtestfuzz \ Modules/cjkcodecs \ Modules/expat \ diff --git a/configure.ac b/configure.ac index 88219dc9b54643..f940c9b2ddf001 100644 --- a/configure.ac +++ b/configure.ac @@ -6439,6 +6439,7 @@ SRCDIRS="\ Modules/_sha3 \ Modules/_sqlite \ Modules/_sre \ + Modules/_testcapi \ Modules/_xxtestfuzz \ Modules/cjkcodecs \ Modules/expat \