commit b1d4b1d6b8a7876496af6b8af422d1c8058d5f4e
author Nico Huber <nico.h@gmx.de> Fri Mar 17 13:32:06 2023 +0000
committer Nico Huber <nico.h@gmx.de> Sat Mar 18 13:28:45 2023 +0000
tree 345667dcd81b78d57450f65bef9f8a1dc61188a0
parent da09599c1230e7461129c19fea919e2b536a26ba

manibuilder: Update overrides for missing libraries

Now that we bail-out on missing dependencies again, we have a lot of
additional overrides to provide.

Change-Id: I5401c88b85333b5a6d6d5ed9f34fb83e0c677364
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/73777
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

util/manibuilder/Makefile.anita

diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index d4fb23d..b52a19c 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -66,6 +66,9 @@
 # No libjaylink
 $(ANITA_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
 
+# No libftdi1
+$(ANITA_TAGS): MAKEARGS+=CONFIG_FT2232_SPI=no CONFIG_USBBLASTER_SPI=no
+
 # Compiler doesn't like simplified initializers, e.g. `= { 0 };`
 anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=WARNERROR=no
 

util/manibuilder/Makefile.env

diff --git a/util/manibuilder/Makefile.env b/util/manibuilder/Makefile.env
index 79bca73..ac87cba 100644
--- a/util/manibuilder/Makefile.env
+++ b/util/manibuilder/Makefile.env
@@ -11,6 +11,26 @@
 # Compiler doesn't like simplified initializers, e.g. `= { 0 };`
 $(filter centos\:%, $(MULTIARCH_TAGS)): MAKEARGS+=WARNERROR=no
 
+# No libftdi1
+NO_LIBFTDI1_TAGS := \
+	$(ALMALINUX_TAGS) \
+	$(filter centos\:%, $(MULTIARCH_TAGS)) \
+
+$(NO_LIBFTDI1_TAGS): MAKEARGS+=CONFIG_FT2232_SPI=no CONFIG_USBBLASTER_SPI=no
+
+# No libgpiod
+NO_LIBGPIOD_TAGS := \
+	$(filter %\:8, $(ALMALINUX_TAGS)) \
+	$(filter centos\:% %-bionic %-xenial %-stretch, $(MULTIARCH_TAGS)) \
+	$(foreach v, fedora\:24 fedora\:25, $(filter $(v)-%, $(MULTIARCH_TAGS))) \
+	$(foreach v, v3.6 v3.7 v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
+
+$(NO_LIBGPIOD_TAGS): MAKEARGS+=CONFIG_LINUX_GPIO_SPI=no
+
 # No libjaylink
-$(filter alpine\:% centos\:%, $(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
-$(filter %-xenial %-stretch, $(MULTIARCH_TAGS)): MAKEARGS+=CONFIG_JLINK_SPI=no
+NO_LIBJAYLINK_TAGS := \
+	$(ALMALINUX_TAGS) \
+	$(filter alpine\:% centos\:% %-xenial %-stretch, $(MULTIARCH_TAGS)) \
+	$(foreach v, 3.15 3.16 3.17, $(filter %/alpine\:$(v), $(OFFICIAL_TAGS))) \
+
+$(NO_LIBJAYLINK_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no