From d2d962b12a0daba07d803fa35aa4e16c4b391239 Mon Sep 17 00:00:00 2001 From: magnum Date: Mon, 13 Oct 2025 00:46:11 +0200 Subject: [PATCH] Fix a "format order" regression from the autodep branch We're sorting the format list in struct name order, but we want the OpenCL formats last in the list. Closes #5863 --- src/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in index a154ec05f4..6fe2f928e9 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -257,10 +257,11 @@ version.h: version.h.new # These are SLOW nowadays, lots of plugins. fmt_externs.h: .plugin_fmt_list - $(CC) -DFMT_EXTERNS_H -E -P $(CFLAGS) $(PLUGFORMATS_SRCS) | grep -F "extern struct fmt_main" | $(SORT) -f > $@ + $(CC) -DFMT_EXTERNS_H -E -P $(CFLAGS) $(PLUGFORMATS_SRCS) | grep -F "extern struct fmt_main" > $@ || true fmt_registers.h: .plugin_fmt_list - $(CC) -DFMT_REGISTERS_H -E -P $(CFLAGS) $(PLUGFORMATS_SRCS) | grep -F "john_register_one" | $(SORT) -f > $@ + $(CC) -DFMT_REGISTERS_H -E -P $(CFLAGS) $(filter-out opencl_%_fmt_plug.c, $(wildcard *_fmt_plug.c)) | grep -F "john_register_one" | $(SORT) -f > $@ || true + $(CC) -DFMT_REGISTERS_H -E -P $(CFLAGS) $(wildcard opencl_*_fmt_plug.c) | grep -F "john_register_one" | $(SORT) -f >> $@ || true .PHONY: subdirs $(SUBDIRS)