This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 310ff99f621e3c1e8bfb9ae27ea46ed887640092 Author: Niklas Haas <[email protected]> AuthorDate: Tue Apr 14 03:31:38 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Thu Jun 4 11:44:52 2026 +0200 configure: support building without checkasm Signed-off-by: Niklas Haas <[email protected]> --- configure | 7 +++++++ tests/checkasm/Makefile | 4 ++++ tests/fate/checkasm.mak | 3 +++ 3 files changed, 14 insertions(+) diff --git a/configure b/configure index a67ed344ae..a48b5e4e19 100755 --- a/configure +++ b/configure @@ -111,6 +111,7 @@ Configuration options: --disable-unstable disable building optional unstable / experimental code --disable-all disable building components, libraries and programs --disable-autodetect disable automatically detected external libraries [no] + --disable-checkasm disable building the checkasm test binary [no] Program options: --disable-programs do not build command line programs @@ -2217,6 +2218,7 @@ DOCUMENT_LIST=" " FEATURE_LIST=" + checkasm ftrapv gray hardcoded_tables @@ -4469,6 +4471,7 @@ enable stripping enable version_tracking enable asm +enable checkasm enable debug enable doc enable faan faandct faanidct @@ -8856,6 +8859,8 @@ echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak cp_if_changed $TMPH config_components.h enabled x86asm && cp_if_changed $TMPASM config_components.asm +if enabled checkasm; then + # Reopen a new TMPH for checkasm_config_generated.h cat > $TMPH <<EOF /* Automatically generated by configure - do not modify! */ @@ -8910,6 +8915,8 @@ EOF cp_if_changed $TMPASM checkasm_config_generated.asm fi +fi # enabled checkasm + cat > $TMPH <<EOF /* Generated by ffmpeg configure */ #ifndef AVUTIL_AVCONFIG_H diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 16711a30c5..3b1fc7b2ca 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -1,3 +1,5 @@ +ifeq ($(CONFIG_CHECKASM),yes) + # libavcodec tests # subsystems AVCODECOBJS-$(CONFIG_AC3DSP) += ac3dsp.o @@ -170,3 +172,5 @@ checkasmclean: $(RM) $(CHECKASM) $(CLEANSUFFIXES:%=tests/checkasm/%) $(CLEANSUFFIXES:%=tests/checkasm/$(ARCH)/%) $(CHECKASMOBJS) .PHONY: checkasm + +endif # CONFIG_CHECKASM diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 5fc1ec1e5f..249fb91d4f 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -1,3 +1,4 @@ +ifeq ($(CONFIG_CHECKASM),yes) FATE_CHECKASM = fate-checkasm-aacencdsp \ fate-checkasm-aacpsdsp \ fate-checkasm-ac3dsp \ @@ -102,3 +103,5 @@ $(FATE_CHECKASM): CMP = null FATE += $(FATE_CHECKASM) fate-checkasm: $(FATE_CHECKASM) + +endif # CONFIG_CHECKASM _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
