From 06400861caa4fd0a166a44d40101210e16b3beca Mon Sep 17 00:00:00 2001 From: Meiye-lj Date: Sat, 26 Oct 2024 09:29:19 +0800 Subject: [PATCH 1/3] fixes missing dependencies in Makefile.pre.in --- Makefile.pre.in | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index d6f75a931a3db2..371cc4f93232b8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -346,7 +346,8 @@ MODULE_OBJS= \ Modules/main.o \ Modules/gcmodule.o -IO_H= Modules/_io/_iomodule.h +IO_H= Modules/_io/_iomodule.h \ + Include/internal/pycore_emscripten_trampoline.h IO_OBJS= \ Modules/_io/_iomodule.o \ @@ -685,6 +686,8 @@ LIBHACL_BLAKE2_HEADERS= \ Modules/_hacl/internal/Hacl_Impl_Blake2_Constants.h \ Modules/_hacl/internal/Hacl_Hash_Blake2s_Simd128.h \ Modules/_hacl/internal/Hacl_Hash_Blake2b_Simd256.h \ + Modules/_hacl/lib_memzero0.h \ + Modules/_hacl/libintvector.h \ $(LIBHACL_HEADERS) ######################################################################### @@ -1200,6 +1203,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_dict.h \ $(srcdir)/Include/internal/pycore_dict_state.h \ $(srcdir)/Include/internal/pycore_dtoa.h \ + $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Include/internal/pycore_exceptions.h \ $(srcdir)/Include/internal/pycore_faulthandler.h \ $(srcdir)/Include/internal/pycore_fileutils.h \ @@ -1293,6 +1297,7 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_uop_metadata.h \ $(srcdir)/Include/internal/pycore_warnings.h \ $(srcdir)/Include/internal/pycore_weakref.h \ + $(srcdir)/Python/condvar.h \ $(DTRACE_HEADERS) \ @PLATFORM_HEADERS@ \ \ @@ -1580,7 +1585,7 @@ FROZEN_FILES_OUT = \ Python/frozen_modules/frozen_only.h # End FROZEN_FILES_OUT -Programs/_freeze_module.o: Programs/_freeze_module.c Makefile +Programs/_freeze_module.o: $(srcdir)/Programs/_freeze_module.c Makefile Modules/getpath_noop.o: $(srcdir)/Modules/getpath_noop.c Makefile @@ -1754,15 +1759,15 @@ Programs/python.o: $(srcdir)/Programs/python.c Programs/_testembed.o: $(srcdir)/Programs/_testembed.c Programs/test_frozenmain.h $(PYTHON_HEADERS) $(CC) -c $(PY_CORE_CFLAGS) -o $@ $(srcdir)/Programs/_testembed.c -Modules/_sre/sre.o: $(srcdir)/Modules/_sre/sre.c $(srcdir)/Modules/_sre/sre.h $(srcdir)/Modules/_sre/sre_constants.h $(srcdir)/Modules/_sre/sre_lib.h +Modules/_sre/sre.o: $(srcdir)/Modules/_sre/sre.c $(srcdir)/Modules/_sre/sre.h $(srcdir)/Modules/_sre/sre_constants.h $(srcdir)/Modules/_sre/sre_lib.h $(srcdir)/Modules/_sre/sre_targets.h -Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h +Modules/posixmodule.o: $(srcdir)/Modules/posixmodule.c $(srcdir)/Modules/posixmodule.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h Modules/grpmodule.o: $(srcdir)/Modules/grpmodule.c $(srcdir)/Modules/posixmodule.h Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule.h -Modules/signalmodule.o: $(srcdir)/Modules/signalmodule.c $(srcdir)/Modules/posixmodule.h +Modules/signalmodule.o: $(srcdir)/Modules/signalmodule.c $(srcdir)/Modules/posixmodule.h $(srcdir)/Include/internal/pycore_emscripten_signal.h Modules/_interpretersmodule.o: $(srcdir)/Modules/_interpretersmodule.c $(srcdir)/Modules/_interpreters_common.h @@ -1770,7 +1775,7 @@ Modules/_interpqueuesmodule.o: $(srcdir)/Modules/_interpqueuesmodule.c $(srcdir) Modules/_interpchannelsmodule.o: $(srcdir)/Modules/_interpchannelsmodule.c $(srcdir)/Modules/_interpreters_common.h -Python/crossinterp.o: $(srcdir)/Python/crossinterp.c $(srcdir)/Python/crossinterp_data_lookup.h $(srcdir)/Python/crossinterp_exceptions.h +Python/crossinterp.o: $(srcdir)/Python/crossinterp.c $(srcdir)/Python/crossinterp_data_lookup.h $(srcdir)/Python/crossinterp_exceptions.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h Python/initconfig.o: $(srcdir)/Python/initconfig.c $(srcdir)/Python/config_common.h @@ -1786,7 +1791,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile -DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -o $@ $(srcdir)/Python/dynload_hpux.c -Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h +Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h $(CC) -c $(PY_CORE_CFLAGS) \ -DABIFLAGS='"$(ABIFLAGS)"' \ $(MULTIARCH_CPPFLAGS) \ @@ -1899,8 +1904,10 @@ BYTESTR_DEPS = \ $(srcdir)/Objects/stringlib/ctype.h \ $(srcdir)/Objects/stringlib/fastsearch.h \ $(srcdir)/Objects/stringlib/find.h \ + $(srcdir)/Objects/stringlib/find_max_char.h \ $(srcdir)/Objects/stringlib/join.h \ $(srcdir)/Objects/stringlib/partition.h \ + $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Objects/stringlib/split.h \ $(srcdir)/Objects/stringlib/stringdefs.h \ $(srcdir)/Objects/stringlib/transmogrify.h @@ -1914,6 +1921,7 @@ UNICODE_DEPS = \ $(srcdir)/Objects/stringlib/find_max_char.h \ $(srcdir)/Objects/stringlib/localeutil.h \ $(srcdir)/Objects/stringlib/partition.h \ + $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Objects/stringlib/replace.h \ $(srcdir)/Objects/stringlib/repr.h \ $(srcdir)/Objects/stringlib/split.h \ @@ -1921,7 +1929,8 @@ UNICODE_DEPS = \ $(srcdir)/Objects/stringlib/ucs2lib.h \ $(srcdir)/Objects/stringlib/ucs4lib.h \ $(srcdir)/Objects/stringlib/undef.h \ - $(srcdir)/Objects/stringlib/unicode_format.h + $(srcdir)/Objects/stringlib/unicode_format.h \ + $(srcdir)/Objects/stringlib/eq.h Objects/bytes_methods.o: $(srcdir)/Objects/bytes_methods.c $(BYTESTR_DEPS) Objects/bytesobject.o: $(srcdir)/Objects/bytesobject.c $(BYTESTR_DEPS) @@ -1929,14 +1938,16 @@ Objects/bytearrayobject.o: $(srcdir)/Objects/bytearrayobject.c $(BYTESTR_DEPS) Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c $(UNICODE_DEPS) -Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h -Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h +Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h +Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h Objects/obmalloc.o: $(srcdir)/Objects/mimalloc/alloc.c \ $(srcdir)/Objects/mimalloc/alloc-aligned.c \ + $(srcdir)/Objects/mimalloc/alloc-override.c \ $(srcdir)/Objects/mimalloc/alloc-posix.c \ $(srcdir)/Objects/mimalloc/arena.c \ $(srcdir)/Objects/mimalloc/bitmap.c \ + $(srcdir)/Objects/mimalloc/bitmap.h \ $(srcdir)/Objects/mimalloc/heap.c \ $(srcdir)/Objects/mimalloc/init.c \ $(srcdir)/Objects/mimalloc/options.c \ @@ -1945,11 +1956,14 @@ Objects/obmalloc.o: $(srcdir)/Objects/mimalloc/alloc.c \ $(srcdir)/Objects/mimalloc/random.c \ $(srcdir)/Objects/mimalloc/segment.c \ $(srcdir)/Objects/mimalloc/segment-map.c \ + $(srcdir)/Objects/mimalloc/static.c \ $(srcdir)/Objects/mimalloc/stats.c \ + $(srcdir)/Objects/mimalloc/page-queue.c \ $(srcdir)/Objects/mimalloc/prim/prim.c \ $(srcdir)/Objects/mimalloc/prim/osx/prim.c \ $(srcdir)/Objects/mimalloc/prim/unix/prim.c \ - $(srcdir)/Objects/mimalloc/prim/wasi/prim.c + $(srcdir)/Objects/mimalloc/prim/wasi/prim.c \ + $(srcdir)/Include/internal/pycore_emscripten_trampoline.h Objects/mimalloc/page.o: $(srcdir)/Objects/mimalloc/page-queue.c @@ -2027,6 +2041,8 @@ Python/compile.o Python/codegen.o Python/assemble.o Python/flowgraph.o Python/in $(srcdir)/Include/internal/pycore_opcode_utils.h Python/ceval.o: \ + $(srcdir)/Include/internal/pycore_emscripten_signal.h \ + $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Python/ceval_macros.h \ $(srcdir)/Python/condvar.h \ $(srcdir)/Python/generated_cases.c.h \ @@ -2059,13 +2075,13 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d mv $@.tmp $@ Python/ceval.o: $(srcdir)/Include/pydtrace.h -Python/gc.o: $(srcdir)/Include/pydtrace.h -Python/import.o: $(srcdir)/Include/pydtrace.h +Python/gc.o: $(srcdir)/Include/pydtrace.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h +Python/import.o: $(srcdir)/Include/pydtrace.h $(srcdir)/Include/internal/pycore_emscripten_trampoline.h $(srcdir)/Include/internal/pycore_magic_number.h Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) -Objects/typeobject.o: Objects/typeslots.inc +Objects/typeobject.o: Objects/typeslots.inc $(srcdir)/Include/internal/pycore_emscripten_trampoline.h .PHONY: regen-typeslots regen-typeslots: From 91cd3a2da5f5c2ba5628cbd5457bdbb09123c2dc Mon Sep 17 00:00:00 2001 From: Meiye-lj Date: Tue, 29 Oct 2024 09:14:02 +0800 Subject: [PATCH 2/3] update fix missing dependencies in Makefile.pre.in --- Makefile.pre.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 371cc4f93232b8..cb0a01551c6a77 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -346,7 +346,8 @@ MODULE_OBJS= \ Modules/main.o \ Modules/gcmodule.o -IO_H= Modules/_io/_iomodule.h \ +IO_H= \ + Modules/_io/_iomodule.h \ Include/internal/pycore_emscripten_trampoline.h IO_OBJS= \ @@ -449,7 +450,6 @@ PYTHON_OBJS= \ Python/getcopyright.o \ Python/getplatform.o \ Python/getversion.o \ - Python/ceval_gil.o \ Python/hamt.o \ Python/hashtable.o \ Python/import.o \ @@ -1297,7 +1297,6 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_uop_metadata.h \ $(srcdir)/Include/internal/pycore_warnings.h \ $(srcdir)/Include/internal/pycore_weakref.h \ - $(srcdir)/Python/condvar.h \ $(DTRACE_HEADERS) \ @PLATFORM_HEADERS@ \ \ @@ -1958,7 +1957,6 @@ Objects/obmalloc.o: $(srcdir)/Objects/mimalloc/alloc.c \ $(srcdir)/Objects/mimalloc/segment-map.c \ $(srcdir)/Objects/mimalloc/static.c \ $(srcdir)/Objects/mimalloc/stats.c \ - $(srcdir)/Objects/mimalloc/page-queue.c \ $(srcdir)/Objects/mimalloc/prim/prim.c \ $(srcdir)/Objects/mimalloc/prim/osx/prim.c \ $(srcdir)/Objects/mimalloc/prim/unix/prim.c \ @@ -2044,11 +2042,13 @@ Python/ceval.o: \ $(srcdir)/Include/internal/pycore_emscripten_signal.h \ $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Python/ceval_macros.h \ - $(srcdir)/Python/condvar.h \ $(srcdir)/Python/generated_cases.c.h \ $(srcdir)/Python/executor_cases.c.h \ $(srcdir)/Python/opcode_targets.h +Python/ceval_gil.o \ + $(srcdir)/Python/condvar.h + Python/flowgraph.o: \ $(srcdir)/Include/internal/pycore_opcode_metadata.h From 57f60c473cf4c866d971f02f1ede09ec09f457bb Mon Sep 17 00:00:00 2001 From: Meiye-lj Date: Tue, 29 Oct 2024 09:14:02 +0800 Subject: [PATCH 3/3] update fix missing dependencies in Makefile.pre.in --- Makefile.pre.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in index 371cc4f93232b8..317e5739ade2ba 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -346,7 +346,8 @@ MODULE_OBJS= \ Modules/main.o \ Modules/gcmodule.o -IO_H= Modules/_io/_iomodule.h \ +IO_H= \ + Modules/_io/_iomodule.h \ Include/internal/pycore_emscripten_trampoline.h IO_OBJS= \ @@ -449,7 +450,6 @@ PYTHON_OBJS= \ Python/getcopyright.o \ Python/getplatform.o \ Python/getversion.o \ - Python/ceval_gil.o \ Python/hamt.o \ Python/hashtable.o \ Python/import.o \ @@ -1297,7 +1297,6 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_uop_metadata.h \ $(srcdir)/Include/internal/pycore_warnings.h \ $(srcdir)/Include/internal/pycore_weakref.h \ - $(srcdir)/Python/condvar.h \ $(DTRACE_HEADERS) \ @PLATFORM_HEADERS@ \ \ @@ -1958,7 +1957,6 @@ Objects/obmalloc.o: $(srcdir)/Objects/mimalloc/alloc.c \ $(srcdir)/Objects/mimalloc/segment-map.c \ $(srcdir)/Objects/mimalloc/static.c \ $(srcdir)/Objects/mimalloc/stats.c \ - $(srcdir)/Objects/mimalloc/page-queue.c \ $(srcdir)/Objects/mimalloc/prim/prim.c \ $(srcdir)/Objects/mimalloc/prim/osx/prim.c \ $(srcdir)/Objects/mimalloc/prim/unix/prim.c \ @@ -2044,11 +2042,13 @@ Python/ceval.o: \ $(srcdir)/Include/internal/pycore_emscripten_signal.h \ $(srcdir)/Include/internal/pycore_emscripten_trampoline.h \ $(srcdir)/Python/ceval_macros.h \ - $(srcdir)/Python/condvar.h \ $(srcdir)/Python/generated_cases.c.h \ $(srcdir)/Python/executor_cases.c.h \ $(srcdir)/Python/opcode_targets.h +Python/ceval_gil.o: \ + $(srcdir)/Python/condvar.h + Python/flowgraph.o: \ $(srcdir)/Include/internal/pycore_opcode_metadata.h