PR #23343 opened by Martin Storsjö (mstorsjo) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23343 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23343.patch
This was accidentally broken by 4569ab7eaa0d709fa9b578bc86d703212638a16c. Add a missing item to `checkasm_config_generated.h`. From 7d6e59fd7e223c9aa32b5e509ec1ae5a584204fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> Date: Thu, 4 Jun 2026 23:06:57 +0300 Subject: [PATCH 1/2] configure: Include stdbit_h in the checkasm config header --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 2abf11614a..637c293ae5 100755 --- a/configure +++ b/configure @@ -8871,7 +8871,7 @@ if enabled checkasm; then #define CHECKASM_VERSION "1.2.0" EOF - print_config HAVE_ "$TMPH" elf_aux_info getauxval ioctl isatty linux_perf pthread_np_h pthread_setaffinity_np sigaction siglongjmp clock_gettime prctl + print_config HAVE_ "$TMPH" elf_aux_info getauxval ioctl isatty linux_perf pthread_np_h pthread_setaffinity_np sigaction siglongjmp clock_gettime prctl stdbit_h if enabled aarch64; then print_config HAVE_ "$TMPH" as_archext_sve_directive sve -- 2.52.0 From dcea8860687fadff8cd854405d35426691395264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> Date: Thu, 4 Jun 2026 23:07:24 +0300 Subject: [PATCH 2/2] checkasm: Fix defining CHECKASM_HAVE_GENERATED_H Commit 4569ab7eaa0d709fa9b578bc86d703212638a16c tried to set this only on the object files for the checkasm library itself, but missed that EXT_CHECKASMOBJS lacks the path prefix, thus this wasn't set at all. Alternatively, for simplicity, we could keep passing this for all checkasm object files, not only the checkasm library objects; the other object files don't use it in any case. --- tests/checkasm/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 5a268089ee..c154d19ed4 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -153,9 +153,9 @@ $(CHECKASMOBJS): CFLAGS += -DCHECKASM_HAVE_HEADER_GENERATED_H $(CHECKASMOBJS): ASFLAGS += -DCHECKASM_HAVE_HEADER_GENERATED_H # Expose checkasm_config_generated.h/asm only to checkasm itself. -$(EXT_CHECKASMOBJS): CFLAGS += -DCHECKASM_HAVE_GENERATED_H -$(EXT_CHECKASMOBJS): ASFLAGS += -DCHECKASM_HAVE_GENERATED_H -$(EXT_CHECKASMOBJS): X86ASMFLAGS += -DCHECKASM_HAVE_GENERATED_H +$(EXT_CHECKASMOBJS:%=tests/checkasm/%): CFLAGS += -DCHECKASM_HAVE_GENERATED_H +$(EXT_CHECKASMOBJS:%=tests/checkasm/%): ASFLAGS += -DCHECKASM_HAVE_GENERATED_H +$(EXT_CHECKASMOBJS:%=tests/checkasm/%): X86ASMFLAGS += -DCHECKASM_HAVE_GENERATED_H tests/checkasm/checkasm.o: CFLAGS += -Umain -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
